Android: factor out use of SDK jar.

Specify the path to the Android SDK main jarfile in a single location so
that it can be overridden by the WebView build.

BUG=
TBR=fischman@chromium.org,brettw@chromium.org

Review URL: https://codereview.chromium.org/12524008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188737 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 10 insertions, 17 deletions

diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp
index 11e8ae8..28ef1d8 100644
--- a/android_webview/native/webview_native.gyp
+++ b/android_webview/native/webview_native.gyp
@@ -70,7 +70,6 @@
       'variables': {
         'jni_gen_package': 'android_webview',
         'input_java_class': 'java/io/InputStream.class',
-        'input_jar_file': '<(android_sdk)/android.jar',
       },
       'includes': [ '../../build/jar_file_jni_generator.gypi' ],
     },
diff --git a/build/common.gypi b/build/common.gypi
index f070f42..11920ea 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1122,13 +1122,15 @@
              'android_ndk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/ndk/',
              'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/sdk/',
              'android_host_arch%': '<!(uname -m)',
+             # Android API-level of the SDK used for compilation.
+             'android_sdk_version%': '17',
           },
           # Copy conditionally-set variables out one scope.
           'android_ndk_root%': '<(android_ndk_root)',
           'android_sdk_root%': '<(android_sdk_root)',
+          'android_sdk_version%': '<(android_sdk_version)',
 
-          # Android API-level of the SDK used for compilation.
-          'android_sdk_version%': '17',
+          'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_version)',
 
           # Android API level 14 is ICS (Android 4.0) which is the minimum
           # platform requirement for Chrome on Android, we use it for native
@@ -1166,7 +1168,8 @@
         'android_ndk_include': '<(android_ndk_sysroot)/usr/include',
         'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib',
         'android_sdk_tools%': '<(android_sdk_root)/platform-tools',
-        'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_version)',
+        'android_sdk%': '<(android_sdk)',
+        'android_sdk_jar%': '<(android_sdk)/android.jar',
 
         # Location of the "strip" binary, used by both gyp and scripts.
         'android_strip%' : '<!(/bin/echo -n <(android_toolchain)/*-strip)',
diff --git a/build/jar_file_jni_generator.gypi b/build/jar_file_jni_generator.gypi
index 3a2447e..dc02f25 100644
--- a/build/jar_file_jni_generator.gypi
+++ b/build/jar_file_jni_generator.gypi
@@ -12,7 +12,6 @@
 #   'variables': {
 #     'jni_gen_package': 'chrome',
 #     'input_java_class': 'java/io/InputStream.class',
-#     'input_jar_file': '<(android_sdk)/android.jar',
 #   },
 #   'includes': [ '../build/jar_file_jni_generator.gypi' ],
 # },
@@ -26,7 +25,7 @@
       'action_name': 'generate_jni_headers_from_jar_file',
       'inputs': [
         '<(jni_generator)',
-        '<(input_jar_file)',
+        '<(android_sdk_jar)',
       ],
       'variables': {
         'java_class_name': '<!(basename <(input_java_class)|sed "s/\.class//")'
@@ -37,7 +36,7 @@
       'action': [
         '<(jni_generator)',
         '-j',
-        '<(input_jar_file)',
+        '<(android_sdk_jar)',
         '--input_file',
         '<(input_java_class)',
         '--output_dir',
@@ -45,7 +44,7 @@
         '--optimize_generation',
         '<(optimize_jni_generation)',
       ],
-      'message': 'Generating JNI bindings from  <(input_jar_file)/<(input_java_class)',
+      'message': 'Generating JNI bindings from  <(android_sdk_jar)/<(input_java_class)',
       'process_outputs_as_sources': 1,
     },
   ],
diff --git a/build/java.gypi b/build/java.gypi
index fd9a1bc..b86ebea 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -47,8 +47,7 @@
     '<(DEPTH)/build/build_output_dirs_android.gyp:build_output_dirs'
   ],
   'variables': {
-    'android_jar': '<(android_sdk)/android.jar',
-    'input_jars_paths': [ '<(android_jar)' ],
+    'input_jars_paths': [ '<(android_sdk_jar)' ],
     'additional_src_dirs': [],
     'javac_includes': [],
     'jar_name': '<(_target_name).jar',
diff --git a/content/content.gyp b/content/content.gyp
index 7afba7c..efaf48d 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -360,7 +360,6 @@
           'variables': {
             'jni_gen_package': 'content',
             'input_java_class': 'android/graphics/SurfaceTexture.class',
-            'input_jar_file': '<(android_sdk)/android.jar',
           },
           'includes': [ '../build/jar_file_jni_generator.gypi' ],
         },
@@ -370,7 +369,6 @@
           'variables': {
             'jni_gen_package': 'content',
             'input_java_class': 'android/view/Surface.class',
-            'input_jar_file': '<(android_sdk)/android.jar',
           },
           'includes': [ '../build/jar_file_jni_generator.gypi' ],
         },
@@ -380,7 +378,6 @@
           'variables': {
             'jni_gen_package': 'content',
             'input_java_class': 'java/util/HashSet.class',
-            'input_jar_file': '<(android_sdk)/android.jar',
           },
           'includes': [ '../build/jar_file_jni_generator.gypi' ],
         },
diff --git a/media/media.gyp b/media/media.gyp
index 98fd685..f056ff8 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1399,7 +1399,6 @@
           'variables': {
             'jni_gen_package': 'media',
             'input_java_class': 'android/media/MediaPlayer.class',
-            'input_jar_file': '<(android_sdk)/android.jar',
           },
           'includes': [ '../build/jar_file_jni_generator.gypi' ],
         },
@@ -1435,7 +1434,6 @@
           'variables': {
             'jni_gen_package': 'media',
             'input_java_class': 'android/media/MediaCodec.class',
-            'input_jar_file': '<(android_sdk)/android.jar',
           },
           'includes': [ '../build/jar_file_jni_generator.gypi' ],
         },
@@ -1445,7 +1443,6 @@
           'variables': {
             'jni_gen_package': 'media',
             'input_java_class': 'android/media/MediaFormat.class',
-            'input_jar_file': '<(android_sdk)/android.jar',
           },
           'includes': [ '../build/jar_file_jni_generator.gypi' ],
         },
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 7a47d14..0af9071 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -506,7 +506,6 @@
           'variables': {
             'jni_gen_package': 'webkit',
             'input_java_class': 'android/widget/OverScroller.class',
-            'input_jar_file': '<(android_sdk)/android.jar',
           },
           'includes': [ '../../build/jar_file_jni_generator.gypi' ],
         },