Merge from Chromium at DEPS revision r205460
This commit was generated by merge_to_master.py.
Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
diff --git a/build/jni_generator.gypi b/build/jni_generator.gypi
index 465a061..680a0ee 100644
--- a/build/jni_generator.gypi
+++ b/build/jni_generator.gypi
@@ -30,6 +30,7 @@
{
'variables': {
'jni_generator': '<(DEPTH)/base/android/jni_generator/jni_generator.py',
+ 'jni_generator_jarjar_file%': '',
},
'rules': [
{
@@ -49,9 +50,18 @@
'<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_package)/jni',
'--optimize_generation',
'<(optimize_jni_generation)',
+ '--jarjar',
+ '<(jni_generator_jarjar_file)',
],
'message': 'Generating JNI bindings from <(RULE_INPUT_PATH)',
'process_outputs_as_sources': 1,
+ 'conditions': [
+ ['jni_generator_jarjar_file != ""', {
+ 'inputs': [
+ '<(jni_generator_jarjar_file)',
+ ],
+ }]
+ ],
},
],
# This target exports a hard dependency because it generates header