[Android] Change jni_gen_dir to jni_gen_package for jni_generator.

With the old name it was getting relativized which is undesirable. See
bug for more details.

BUG=159133
TBR=ben (nobody really cares about this outside of build/ which cjhopman approved)


Review URL: https://chromiumcodereview.appspot.com/12558005

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

16 files changed, 29 insertions, 29 deletions

diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
index ea76d62..95b51dc 100644
--- a/android_webview/android_webview_tests.gypi
+++ b/android_webview/android_webview_tests.gypi
@@ -80,7 +80,7 @@
           '../android_webview/unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java',
       ],
       'variables': {
-        'jni_gen_dir': 'android_webview_unittests',
+        'jni_gen_package': 'android_webview_unittests',
       },
       'includes': [ '../build/jni_generator.gypi' ],
     },
diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp
index ed5526d..11e8ae8 100644
--- a/android_webview/native/webview_native.gyp
+++ b/android_webview/native/webview_native.gyp
@@ -68,7 +68,7 @@
       'target_name': 'android_jar_jni_headers',
       'type': 'none',
       'variables': {
-        'jni_gen_dir': 'android_webview',
+        'jni_gen_package': 'android_webview',
         'input_java_class': 'java/io/InputStream.class',
         'input_jar_file': '<(android_sdk)/android.jar',
       },
@@ -93,7 +93,7 @@
           '../java/src/org/chromium/android_webview/JsResultHandler.java',
       ],
       'variables': {
-        'jni_gen_dir': 'android_webview',
+        'jni_gen_package': 'android_webview',
       },
       'includes': [ '../../build/jni_generator.gypi' ],
       'dependencies': [
diff --git a/base/android/jni_generator/jni_generator.gyp b/base/android/jni_generator/jni_generator.gyp
index dc32d22..d893dd1 100644
--- a/base/android/jni_generator/jni_generator.gyp
+++ b/base/android/jni_generator/jni_generator.gyp
@@ -32,7 +32,7 @@
         'SampleForTests.java',
       ],
       'variables': {
-        'jni_gen_dir': 'base',
+        'jni_gen_package': 'base',
       },
       'includes': [ '../../../build/jni_generator.gypi' ],
     },
diff --git a/base/base.gyp b/base/base.gyp
index 8118d87a..1355944 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1113,7 +1113,7 @@
             'android/java/src/org/chromium/base/ThreadUtils.java',
           ],
           'variables': {
-            'jni_gen_dir': 'base',
+            'jni_gen_package': 'base',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
diff --git a/build/jar_file_jni_generator.gypi b/build/jar_file_jni_generator.gypi
index 2f03b85..3a2447e 100644
--- a/build/jar_file_jni_generator.gypi
+++ b/build/jar_file_jni_generator.gypi
@@ -10,7 +10,7 @@
 #   'target_name': 'android_jar_jni_headers',
 #   'type': 'none',
 #   'variables': {
-#     'jni_gen_dir': 'chrome',
+#     'jni_gen_package': 'chrome',
 #     'input_java_class': 'java/io/InputStream.class',
 #     'input_jar_file': '<(android_sdk)/android.jar',
 #   },
@@ -32,7 +32,7 @@
         'java_class_name': '<!(basename <(input_java_class)|sed "s/\.class//")'
       },
       'outputs': [
-        '<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_dir)/jni/<(java_class_name)_jni.h',
+        '<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_package)/jni/<(java_class_name)_jni.h',
       ],
       'action': [
         '<(jni_generator)',
@@ -41,7 +41,7 @@
         '--input_file',
         '<(input_java_class)',
         '--output_dir',
-        '<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_dir)/jni',
+        '<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_package)/jni',
         '--optimize_generation',
         '<(optimize_jni_generation)',
       ],
diff --git a/build/jni_generator.gypi b/build/jni_generator.gypi
index d45daaaf..465a061 100644
--- a/build/jni_generator.gypi
+++ b/build/jni_generator.gypi
@@ -16,7 +16,7 @@
 #      'android/java/src/org/chromium/base/SystemMessageHandler.java',
 #    ],
 #    'variables': {
-#      'jni_gen_dir': 'base',
+#      'jni_gen_package': 'base',
 #    },
 #    'includes': [ '../build/jni_generator.gypi' ],
 #  },
@@ -39,14 +39,14 @@
         '<(jni_generator)',
       ],
       'outputs': [
-        '<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_dir)/jni/<(RULE_INPUT_ROOT)_jni.h',
+        '<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_package)/jni/<(RULE_INPUT_ROOT)_jni.h',
       ],
       'action': [
         '<(jni_generator)',
         '--input_file',
         '<(RULE_INPUT_PATH)',
         '--output_dir',
-        '<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_dir)/jni',
+        '<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_package)/jni',
         '--optimize_generation',
         '<(optimize_jni_generation)',
       ],
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 7af517b..305004b 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3156,7 +3156,7 @@
             'android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java',
           ],
           'variables': {
-            'jni_gen_dir': 'chrome',
+            'jni_gen_package': 'chrome',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
diff --git a/components/navigation_interception.gypi b/components/navigation_interception.gypi
index 3e14df7..993a916 100644
--- a/components/navigation_interception.gypi
+++ b/components/navigation_interception.gypi
@@ -68,7 +68,7 @@
                 'navigation_interception/android/java/src/org/chromium/components/navigation_interception/NavigationParams.java',
               ],
               'variables': {
-                'jni_gen_dir': 'navigation_interception',
+                'jni_gen_package': 'navigation_interception',
               },
               'includes': [ '../build/jni_generator.gypi' ],
             },
diff --git a/components/web_contents_delegate_android.gypi b/components/web_contents_delegate_android.gypi
index 179b1a6..0a8b845 100644
--- a/components/web_contents_delegate_android.gypi
+++ b/components/web_contents_delegate_android.gypi
@@ -54,7 +54,7 @@
             'web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java',
           ],
           'variables': {
-            'jni_gen_dir': 'web_contents_delegate_android',
+            'jni_gen_package': 'web_contents_delegate_android',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
diff --git a/content/content.gyp b/content/content.gyp
index f5679b9..d01e7d7 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -359,7 +359,7 @@
           'target_name': 'surface_texture_jni_headers',
           'type': 'none',
           'variables': {
-            'jni_gen_dir': 'content',
+            'jni_gen_package': 'content',
             'input_java_class': 'android/graphics/SurfaceTexture.class',
             'input_jar_file': '<(android_sdk)/android.jar',
           },
@@ -369,7 +369,7 @@
           'target_name': 'surface_jni_headers',
           'type': 'none',
           'variables': {
-            'jni_gen_dir': 'content',
+            'jni_gen_package': 'content',
             'input_java_class': 'android/view/Surface.class',
             'input_jar_file': '<(android_sdk)/android.jar',
           },
@@ -379,7 +379,7 @@
           'target_name': 'java_set_jni_headers',
           'type': 'none',
           'variables': {
-            'jni_gen_dir': 'content',
+            'jni_gen_package': 'content',
             'input_java_class': 'java/util/HashSet.class',
             'input_jar_file': '<(android_sdk)/android.jar',
           },
diff --git a/content/content_jni.gypi b/content/content_jni.gypi
index 44ef10a..cbe132a 100644
--- a/content/content_jni.gypi
+++ b/content/content_jni.gypi
@@ -34,7 +34,7 @@
     'public/android/java/src/org/chromium/content/common/TraceEvent.java',
    ],
   'variables': {
-    'jni_gen_dir': 'content'
+    'jni_gen_package': 'content'
   },
   'includes': [ '../build/jni_generator.gypi' ],
 }
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 91a0ee3..9042c5c 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -587,7 +587,7 @@
             ],
           },
           'variables': {
-            'jni_gen_dir': 'content/shell',
+            'jni_gen_package': 'content/shell',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
diff --git a/media/media.gyp b/media/media.gyp
index 7bfee3d..4af2976 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1402,7 +1402,7 @@
           'target_name': 'media_player_jni_headers',
           'type': 'none',
           'variables': {
-            'jni_gen_dir': 'media',
+            'jni_gen_package': 'media',
             'input_java_class': 'android/media/MediaPlayer.class',
             'input_jar_file': '<(android_sdk)/android.jar',
           },
@@ -1419,7 +1419,7 @@
             'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
           ],
           'variables': {
-            'jni_gen_dir': 'media',
+            'jni_gen_package': 'media',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
@@ -1427,7 +1427,7 @@
           'target_name': 'camera_jni_headers',
           'type': 'none',
           'variables': {
-            'jni_gen_dir': 'media',
+            'jni_gen_package': 'media',
             'input_java_class': 'android/hardware/Camera.class',
             'input_jar_file': '<(android_sdk)/android.jar',
           },
@@ -1443,7 +1443,7 @@
             'base/android/java/src/org/chromium/media/VideoCapture.java',
           ],
           'variables': {
-            'jni_gen_dir': 'media',
+            'jni_gen_package': 'media',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
@@ -1451,7 +1451,7 @@
           'target_name': 'media_codec_jni_headers',
           'type': 'none',
           'variables': {
-            'jni_gen_dir': 'media',
+            'jni_gen_package': 'media',
             'input_java_class': 'android/media/MediaCodec.class',
             'input_jar_file': '<(android_sdk)/android.jar',
           },
@@ -1461,7 +1461,7 @@
           'target_name': 'media_format_jni_headers',
           'type': 'none',
           'variables': {
-            'jni_gen_dir': 'media',
+            'jni_gen_package': 'media',
             'input_java_class': 'android/media/MediaFormat.class',
             'input_jar_file': '<(android_sdk)/android.jar',
           },
diff --git a/net/net.gyp b/net/net.gyp
index ad9da2f..04d5633 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -2407,7 +2407,7 @@
             'android/java/src/org/chromium/net/ProxyChangeListener.java',
           ],
           'variables': {
-            'jni_gen_dir': 'net',
+            'jni_gen_package': 'net',
           },
           'direct_dependent_settings': {
             'include_dirs': [
@@ -2423,7 +2423,7 @@
             'android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java',
           ],
           'variables': {
-            'jni_gen_dir': 'net',
+            'jni_gen_package': 'net',
           },
           'direct_dependent_settings': {
             'include_dirs': [
diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
index ebf0b42..9e50c39 100644
--- a/testing/android/native_test.gyp
+++ b/testing/android/native_test.gyp
@@ -79,7 +79,7 @@
             'java/src/org/chromium/native_test/ChromeNativeTestActivity.java'
           ],
           'variables': {
-            'jni_gen_dir': 'testing',
+            'jni_gen_package': 'testing',
           },
           'includes': [ '../../build/jni_generator.gypi' ],
           # So generated jni headers can be found by targets that
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 02c8bda..5f39852 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -857,7 +857,7 @@
              'android/java/src/org/chromium/ui/SelectFileDialog.java',
            ],
            'variables': {
-             'jni_gen_dir': 'ui',
+             'jni_gen_package': 'ui',
            },
            'includes': [ '../build/jni_generator.gypi' ],
          },