Pass resources to dependents as zip files instead of directories

build/java.gypi

Index: build/java.gypi
diff --git a/build/java.gypi b/build/java.gypi
index a67c8361802312ed021b5eede90e4e7f64ab6724..641dc7799f47a055e4f58692a5c523dac7f13e64 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -110,41 +110,31 @@
     ['has_java_resources == 1', {
       'variables': {
         'res_dir': '<(java_in_dir)/res',
-        'res_crunched_dir': '<(intermediate_dir)/res_crunched',
-        'res_v14_compatibility_dir': '<(intermediate_dir)/res_v14_compatibility',
         'res_input_dirs': ['<(res_dir)', '<@(res_extra_dirs)'],
         'resource_input_paths': ['<!@(find <(res_dir) -type f)'],
+
         'R_dir': '<(intermediate_dir)/java_R',
         'R_text_file': '<(R_dir)/R.txt',
-        'R_stamp': '<(intermediate_dir)/resources.stamp',
+
         'generated_src_dirs': ['<(R_dir)'],
-        'additional_input_paths': ['<(R_stamp)', ],
-        'additional_res_dirs': [],
-        'dependencies_res_input_dirs': [],
-        'dependencies_res_files': [],
+        'additional_input_paths': ['<(resource_zip_path)', ],
+
+        'dependencies_res_zip_paths': [],
+        'resource_zip_path': '<(PRODUCT_DIR)/res.java/<(_target_name).zip',
       },
       'all_dependent_settings': {
         'variables': {
-          # Dependent jars include this target's R.java file via
-          # generated_R_dirs and include its resources via
-          # dependencies_res_files.
+          # Dependent libraries include this target's R.java file via
+          # generated_R_dirs.
           'generated_R_dirs': ['<(R_dir)'],
-          'additional_input_paths': ['<(R_stamp)', ],
-          'dependencies_res_files': ['<@(resource_input_paths)'],
 
-          'dependencies_res_input_dirs': ['<@(res_input_dirs)'],
+          # Dependent libraries and apks include this target's resources via
+          # dependencies_res_zip_paths.
+          'additional_input_paths': ['<(resource_zip_path)'],
+          'dependencies_res_zip_paths': ['<(resource_zip_path)'],
 
-          # Dependent APKs include this target's resources via
-          # additional_res_dirs, additional_res_packages, and
-          # additional_R_text_files.
-          'additional_res_dirs': [
-              # The order of these is important to ensure that the proper
-              # version (i.e. the crunched version) of resources takes
-              # precedence.
-              '<(res_crunched_dir)',
-              '<(res_v14_compatibility_dir)',
-              '<@(res_input_dirs)'
-              ],
+          # additional_res_packages and additional_R_text_files are used to
+          # create this packages R.java files when building the APK.
           'additional_res_packages': ['<(R_package)'],
           'additional_R_text_files': ['<(R_text_file)'],
         },
@@ -156,13 +146,9 @@
           'message': 'processing resources for <(_target_name)',
           'variables': {
             'android_manifest': '<(DEPTH)/build/android/AndroidManifest.xml',
-            # Include the dependencies' res dirs so that references to
-            # resources in dependencies can be resolved.
-            'dependencies_res_dirs': ['<@(res_extra_dirs)',
-                                      '>@(dependencies_res_input_dirs)',],
             # Write the inputs list to a file, so that its mtime is updated when
             # the list of inputs changes.
-            'inputs_list_file': '>|(java_resources.<(_target_name).gypcmd >@(resource_input_paths) >@(dependencies_res_files))',
+            'inputs_list_file': '>|(java_resources.<(_target_name).gypcmd >@(resource_input_paths))',
             'process_resources_options': [],
             'conditions': [
               ['res_v14_verify_only == 1', {
@@ -175,25 +161,27 @@
             '<(DEPTH)/build/android/gyp/process_resources.py',
             '<(DEPTH)/build/android/gyp/generate_v14_compatible_resources.py',
             '>@(resource_input_paths)',
-            '>@(dependencies_res_files)',
+            '>@(dependencies_res_zip_paths)',
             '>(inputs_list_file)',
           ],
           'outputs': [
-            '<(R_stamp)',
+            '<(resource_zip_path)',
           ],
           'action': [
             'python', '<(DEPTH)/build/android/gyp/process_resources.py',
             '--android-sdk', '<(android_sdk)',
             '--android-sdk-tools', '<(android_sdk_tools)',
-            '--R-dir', '<(R_dir)',
-            '--dependencies-res-dirs', '>(dependencies_res_dirs)',
-            '--resource-dir', '<(res_dir)',
-            '--res-v14-compatibility-dir', '<(res_v14_compatibility_dir)',
-            '--crunch-output-dir', '<(res_crunched_dir)',
-            '--android-manifest', '<(android_manifest)',
             '--non-constant-id',
+
+            '--android-manifest', '<(android_manifest)',
             '--custom-package', '<(R_package)',
-            '--stamp', '<(R_stamp)',
+
+            '--dependencies-res-zips', '>(dependencies_res_zip_paths)',
+            '--resource-dirs', '<(res_input_dirs)',
+
+            '--R-dir', '<(R_dir)',
+            '--resource-zip-out', '<(resource_zip_path)',
+
             '<@(process_resources_options)',
           ],
         },