Remove passing of --jarjar to jni_generator.py

build/jni_generator.gypi

Index: build/jni_generator.gypi
diff --git a/build/jni_generator.gypi b/build/jni_generator.gypi
index 7a9e3339df1c0f3678ae12f1f2397489c3ac32a1..72567df123e3dc0511758de499d3eca75dc2346a 100644
--- a/build/jni_generator.gypi
+++ b/build/jni_generator.gypi
@@ -30,7 +30,6 @@
 {
   'variables': {
     'jni_generator': '<(DEPTH)/base/android/jni_generator/jni_generator.py',
-    'jni_generator_jarjar_file%': '',
     'jni_generator_ptr_type%': 'long',
     # A comma separated string of include files.
     'jni_generator_includes%': (
@@ -58,21 +57,12 @@
         '<(jni_generator_includes)',
         '--optimize_generation',
         '<(optimize_jni_generation)',
-        '--jarjar',
-        '<(jni_generator_jarjar_file)',
         '--ptr_type',
         '<(jni_generator_ptr_type)',
         '<(native_exports)',
       ],
       'message': 'Generating JNI bindings from <(RULE_INPUT_PATH)',
       'process_outputs_as_sources': 1,
-      'conditions': [
-        ['jni_generator_jarjar_file != ""', {
-          'inputs': [
-            '<(jni_generator_jarjar_file)',
-          ],
-        }]
-      ],
     },
   ],
   'direct_dependent_settings': {