Update from https://crrev.com/329939

build/java_apk.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file is meant to be included into a target to provide a rule
 # to build Android APKs in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_package_apk',
@@ skipping 29 matching lines @@
 #  is_test_apk - Set to 1 if building a test apk.  This prevents resources from
 #    dependencies from being re-included.
 #  native_lib_target - The target_name of the target which generates the final
 #    shared library to be included in this apk. A stripped copy of the
 #    library will be included in the apk.
 #  resource_dir - The directory for resources.
 #  shared_resources - Make a resource package that can be loaded by a different
 #    application at runtime to access the package's resources.
 #  R_package - A custom Java package to generate the resource file R.java in.
 #    By default, the package given in AndroidManifest.xml will be used.
+#  include_all_resources - Set to 1 to include all resource IDs in all generated
+#    R.java files.
 #  use_chromium_linker - Enable the content dynamic linker that allows sharing the
 #    RELRO section of the native libraries between the different processes.
 #  load_library_from_zip_file - When using the dynamic linker, load the library
 #    directly out of the zip file.
 #  use_relocation_packer - Enable relocation packing. Relies on the chromium
 #    linker, so use_chromium_linker must also be enabled.
 #  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!!
 #  never_lint - Set to 1 to not run lint on this target.
@@ skipping 11 matching lines @@
     'generated_src_dirs': [],
     'app_manifest_version_name%': '<(android_app_version_name)',
     'app_manifest_version_code%': '<(android_app_version_code)',
     # aapt generates this proguard.txt.
     'generated_proguard_file': '<(intermediate_dir)/proguard.txt',
     'proguard_enabled%': 'false',
     'proguard_flags_paths': ['<(generated_proguard_file)'],
     'jar_name': 'chromium_apk_<(_target_name).jar',
     'resource_dir%':'<(DEPTH)/build/android/ant/empty/res',
     'R_package%':'',
+    'include_all_resources%': 0,
     'additional_R_text_files': [],
     'dependencies_res_zip_paths': [],
     'additional_res_packages': [],
     'additional_bundled_libs%': [],
     'is_test_apk%': 0,
     'extensions_to_not_compress%': '',
     'resource_input_paths': [],
     'intermediate_dir': '<(PRODUCT_DIR)/<(_target_name)',
     'asset_location%': '<(intermediate_dir)/assets',
     'codegen_stamp': '<(intermediate_dir)/codegen.stamp',
@@ skipping 512 matching lines @@
           ['is_test_apk == 1', {
             'dependencies_res_zip_paths=': [],
             'additional_res_packages=': [],
           }],
           ['res_v14_verify_only == 1', {
             'process_resources_options+': ['--v14-verify-only']
           }],
           ['shared_resources == 1', {
             'process_resources_options+': ['--shared-resources']
           }],
+          ['R_package != ""', {
+            'process_resources_options+': ['--custom-package', '<(R_package)']
+          }],
+          ['include_all_resources == 1', {
+            'process_resources_options+': ['--include-all-resources']
+          }]
         ],
       },
       'inputs': [
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
         '<(DEPTH)/build/android/gyp/process_resources.py',
         '<(android_manifest_path)',
         '>@(additional_input_paths)',
         '>@(resource_input_paths)',
         '>@(dependencies_res_zip_paths)',
         '>(inputs_list_file)',
@@ skipping 176 matching lines @@
 
         '--configuration-name', '<(CONFIGURATION_NAME)',
 
         '--android-sdk', '<(android_sdk)',
         '--android-sdk-tools', '<(android_sdk_tools)',
         '--android-sdk-jar', '<(android_sdk_jar)',
 
         '--input-jars-paths=>(proguard_input_jar_paths)',
         '--proguard-configs=>(proguard_flags_paths)',
 
-
         '--test-jar-path', '<(test_jar_path)',
         '--obfuscated-jar-path', '<(obfuscated_jar_path)',
 
         '--proguard-jar-path', '<(android_sdk_root)/tools/proguard/lib/proguard.jar',
 
         '--stamp', '<(obfuscate_stamp)',
 
         '>@(additional_obfuscate_options)',
       ],
     },
@@ skipping 134 matching lines @@
         '-DEMMA_INSTRUMENT=<(emma_instrument)',
         '-DEMMA_DEVICE_JAR=<(emma_device_jar)',
 
         '-Dbasedir=.',
         '-buildfile',
         '<(DEPTH)/build/android/ant/apk-package.xml',
       ]
     },
   ],
 }