[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: http://src.chromium.org/svn/trunk/src/build@186803 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

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)',
       ],

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)',
       ],