commit 2a99a7e74a7f215066514fe81d2bfa6639d9eddd
author Torne (Richard Coles) <torne@google.com> Thu Mar 28 15:31:22 2013 +0000
committer Torne (Richard Coles) <torne@google.com> Thu Mar 28 15:31:22 2013 +0000
tree 7c2d04841fcd599fd83b0f0bb1100e1c89a35bae
parent 61c449bbbb53310a8c041d8cefdd6b01a126cc7e

Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170

build/jni_generator.gypi

diff --git a/build/jni_generator.gypi b/build/jni_generator.gypi
index 837d9ab..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,16 @@
         '<(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)',
       ],
       'message': 'Generating JNI bindings from <(RULE_INPUT_PATH)',
       'process_outputs_as_sources': 1,