Allow the mojo shell to run on android.

build/java_apk.gypi

Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 5f3653dd2f7594e769cadac5d97236e150208253..55e9bc0378ba6a739f30a696c7b4eec7b93c3789 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -29,6 +29,8 @@
 #    each directory in additional_res_dirs.
 #  additional_src_dirs - Additional directories with .java files to be compiled
 #    and included in the output of this target.
+#  additional_bundled_libs - Additional libraries what will be stripped and
+#    bundled in the apk.
 #  asset_location - The directory where assets are located.
 #  generated_src_dirs - Same as additional_src_dirs except used for .java files
 #    that are generated at build time. This should be set automatically by a
@@ -71,6 +73,7 @@
     'additional_R_text_files': [],
     'dependencies_res_zip_paths': [],
     'additional_res_packages': [],
+    'additional_bundled_libs%': [],
     'is_test_apk%': 0,
     'resource_input_paths': [],
     'intermediate_dir': '<(PRODUCT_DIR)/<(_target_name)',
@@ -78,6 +81,7 @@
     'codegen_stamp': '<(intermediate_dir)/codegen.stamp',
     'package_input_paths': [],
     'ordered_libraries_file': '<(intermediate_dir)/native_libraries.json',
+    'additional_ordered_libraries_file': '<(intermediate_dir)/additional_native_libraries.json',
     'native_libraries_template': '<(DEPTH)/base/android/java/templates/NativeLibraries.template',
     'native_libraries_java_dir': '<(intermediate_dir)/native_libraries_java/',
     'native_libraries_java_file': '<(native_libraries_java_dir)/NativeLibraries.java',
@@ -94,6 +98,7 @@
     'jar_stamp': '<(intermediate_dir)/jar.stamp',
     'obfuscate_stamp': '<(intermediate_dir)/obfuscate.stamp',
     'strip_stamp': '<(intermediate_dir)/strip.stamp',
+    'strip_additional_stamp': '<(intermediate_dir)/strip_additional.stamp',
     'classes_dir': '<(intermediate_dir)/classes/2',
     'javac_includes': [],
     'jar_excluded_classes': [],
@@ -325,6 +330,28 @@
           },
           'includes': ['../build/android/strip_native_libraries.gypi'],
         },
+        {
+          'variables': {
+            'input_libraries': [
+              '<@(additional_bundled_libs)',
+            ],
+            'ordered_libraries_file': '<(additional_ordered_libraries_file)',
+            'subtarget': '_additional_libraries',
+          },
+          'includes': ['../build/android/write_ordered_libraries.gypi'],
+        },
+        {
+          'action_name': 'strip_additional_libraries',
+          'variables': {
+            'ordered_libraries_file': '<(additional_ordered_libraries_file)',
+            'stripped_libraries_dir': '<(libraries_source_dir)',

[cjhopman, 2014/06/26 17:18:04]

There could be some issues here if one of the additional libraries depends on
base (or some other component) that one of the main libraries also depends on.
You could have two strip calls both writing to the same file at the same time. I
don't know what happens in that case.

I think it would be best if we stripped everything in one step (could just make
ordered_libraries_file a list). Another option would be to force an ordering
between the two actions by adding the stamp of one to inputs of the other.

[qsr, 2014/06/27 11:18:18]

 Good point.

 Making it in a single path is unfortunately no that easy. The python script is
using named parameters for the json file, which makes it hard to get a random
number of parameters. Moreover, it would mean some target that use
ordered_libraries_file now take a single one, while other takes multiple.

 I added the stamp as a dependency for the additional one.

 Is that fine with you?

+            'input_paths': [
+              '<@(additional_bundled_libs)',
+            ],
+            'stamp': '<(strip_additional_stamp)'
+          },
+          'includes': ['../build/android/strip_native_libraries.gypi'],
+        },
       ],
       'conditions': [
         ['gyp_managed_install == 1', {
@@ -376,6 +403,7 @@
                     'inputs': [
                       '<(ordered_libraries_file)',
                       '<(strip_stamp)',
+                      '<(strip_additional_stamp)',
                     ],
                     'input_apk_path': '<(unsigned_apk_path)',
                     'output_apk_path': '<(unsigned_standalone_apk_path)',
@@ -390,7 +418,10 @@
           # gyp_managed_install != 1
           'variables': {
             'libraries_source_dir': '<(apk_package_native_libs_dir)/<(android_app_abi)',
-            'package_input_paths': [ '<(strip_stamp)' ],
+            'package_input_paths': [
+              '<(strip_stamp)',
+              '<(strip_additional_stamp)',
+            ],
           },
         }],
       ],