diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-07 08:28:03 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-07 08:28:03 +0000 |
| commit | 5fc01f31043d20344360c33321c5cfe9fc0a2281 (patch) | |
| tree | 418fcc4ee64593269a69a4fbe35619a3c56fd0f7 /build/java_apk.gypi | |
| parent | 7ac2831f036bad31d7e6356f2b40fab4681654db (diff) | |
| download | chromium_src-5fc01f31043d20344360c33321c5cfe9fc0a2281.zip chromium_src-5fc01f31043d20344360c33321c5cfe9fc0a2281.tar.gz chromium_src-5fc01f31043d20344360c33321c5cfe9fc0a2281.tar.bz2 | |
[Second try] Add creation of v14 compatible resources to process_resources.py
There are a lot of steps in processing resources and preparing them for
packaging. It will be easier if these are all done by the same script.
BUG=375431,359249
Review URL: https://codereview.chromium.org/310313005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275645 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/java_apk.gypi')
| -rw-r--r-- | build/java_apk.gypi | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/build/java_apk.gypi b/build/java_apk.gypi index c94959a..1d8fa8e 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -65,6 +65,7 @@ 'proguard_flags_paths': ['<(generated_proguard_file)'], 'jar_name': 'chromium_apk_<(_target_name).jar', 'resource_dir%':'<(DEPTH)/build/android/ant/empty/res', + 'res_v14_compatibility_dir': '<(intermediate_dir)/res_v14_compatibility', 'R_package%':'', 'additional_R_text_files': [], 'additional_res_dirs': [], @@ -115,6 +116,7 @@ 'symlink_script_host_path': '<(intermediate_dir)/create_symlinks.sh', 'symlink_script_device_path': '<(device_intermediate_dir)/create_symlinks.sh', 'create_standalone_apk%': 1, + 'res_v14_verify_only%': 0, 'variables': { 'variables': { 'native_lib_target%': '', @@ -444,15 +446,17 @@ # Write the inputs list to a file, so that its mtime is updated when # the list of inputs changes. 'inputs_list_file': '>|(apk_codegen.<(_target_name).gypcmd >@(additional_input_paths) >@(resource_input_paths))', - }, - 'conditions': [ - ['is_test_apk == 1', { - 'variables': { + 'process_resources_options': [], + 'conditions': [ + ['is_test_apk == 1', { 'additional_res_dirs=': [], 'additional_res_packages=': [], - } - }], - ], + }], + ['res_v14_verify_only == 1', { + 'process_resources_options': ['--v14-verify-only'] + }], + ], + }, 'inputs': [ '<(DEPTH)/build/android/gyp/util/build_utils.py', '<(DEPTH)/build/android/gyp/process_resources.py', @@ -479,11 +483,14 @@ '--proguard-file', '<(generated_proguard_file)', '--resource-dir', '<(resource_dir)', + '--res-v14-compatibility-dir', '<(res_v14_compatibility_dir)', '--crunch-output-dir', '<(crunch_output_dir)', '--R-dir', '<(intermediate_dir)/gen', '--stamp', '<(codegen_stamp)', + + '<@(process_resources_options)', ], }, { |