Add support for uncompress library in APK to the build system

build/java_apk.gypi

Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 92c8cfa0b5e29bb8a70644562bc4182a721e1c59..74df7cf072bdf7f007941a1e40d6d962da6ee71a 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -46,6 +46,8 @@
 #    By default, the package given in AndroidManifest.xml will be used.
 #  use_chromium_linker - Enable the content dynamic linker that allows sharing the
 #    RELRO section of the native libraries between the different processes.
+#  use_library_in_zip_file - When using the dynamic linker, load the library

[rmcilroy, 2014/06/19 09:46:12]

nit - load_library_from_zip_file 

[Anton, 2014/06/19 13:39:45]

Done.

+#    directly out of the zip file.
 #  enable_chromium_linker_tests - Enable the content dynamic linker test support
 #    code. This allows a test APK to inject a Linker.TestRunner instance at
 #    runtime. Should only be used by the chromium_linker_test_apk target!!
@@ -124,6 +126,7 @@
         'native_lib_target%': '',
         'native_lib_version_name%': '',
         'use_chromium_linker%' : 0,
+        'use_library_in_zip_file%' : 0,
         'enable_chromium_linker_tests%': 0,
         'is_test_apk%': 0,
       },
@@ -149,6 +152,7 @@
     'native_lib_version_name%': '',
     'use_chromium_linker%' : 0,
     'enable_chromium_linker_tests%': 0,
+    'use_library_in_zip_file%' : 0,
     'emma_instrument%': '<(emma_instrument)',
     'apk_package_native_libs_dir': '<(apk_package_native_libs_dir)',
     'unsigned_standalone_apk_path': '<(unsigned_standalone_apk_path)',
@@ -265,6 +269,17 @@
           'action_name': 'native_libraries_<(_target_name)',
           'variables': {
             'conditions': [
+              ['use_chromium_linker == 1 and use_library_in_zip_file == 1', {
+                'variables': {
+                  'linker_gcc_preprocess_defines': [
+                    '--defines', 'ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE',

[rmcilroy, 2014/06/19 09:46:12]

Does this work?  I would have though the linker_gcc_preprocess_defines would
have been redefined in line 286 below?  In any case, it seems simpler to have a
one-to-one mapping between these defines and the gyp variables - e.g., only
check for load_library_from_zip_file == 1, and set a new variable (e.g.,
load_from_zip_gcc_preprocessor_defines) which adds a
ENABLE_LOAD_LIBRARY_FROM_ZIP_FILE define, and append it to
gcc_preprocessor_defines in line 308 below.  (and as mentioned in
NativeLibraries.template - make it an error to define
ENABLE_LOAD_LIBRARY_FROM_ZIP_FILE but not 
ENABLE_CHROMIUM_LINKER).

[Anton, 2014/06/19 13:39:45]

What you are suggesting does not work. The tool does not in fact accept a list
as you might expect from the GYP file.

+                  ],
+                }
+              }, {
+                'variables': {
+                  'linker_gcc_preprocess_defines': [],
+                },
+              }],
               ['use_chromium_linker == 1', {
                 'variables': {
                   'linker_gcc_preprocess_defines': [
@@ -407,6 +422,9 @@
           'includes': [ 'android/finalize_apk_action.gypi']
         },
       ],
+      'dependencies': [
+        '<(DEPTH)/build/android/rezip.gyp:rezip#host',
+      ],
     }],
     ['gyp_managed_install == 1', {
       'actions': [
@@ -439,6 +457,9 @@
           ],
         },
       ],
+      'dependencies': [
+        '<(DEPTH)/build/android/rezip.gyp:rezip#host',
+      ],
     }],
     ['is_test_apk == 1', {
       'dependencies': [