Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Unified Diff: build/java.gypi

Issue 18653002: [Android] Add a gyp option to disable generating v14 resources script. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: moved up "'res_v14_verify_only%': 0," Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/gyp/generate_v14_compatible_resources.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/java.gypi
diff --git a/build/java.gypi b/build/java.gypi
index 3fd642965f1bad79836687bdbc8c7d27363e3b59..0e41ab32a0bdc5df985eaf3efb92cc494a22c3de 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -65,6 +65,7 @@
'java_strings_grd%': '',
'res_extra_dirs': [],
'res_extra_files': [],
+ 'res_v14_verify_only%': 0,
'resource_input_paths': ['>@(res_extra_files)'],
'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)',
'classes_dir': '<(intermediate_dir)/classes',
@@ -185,6 +186,16 @@
{
'action_name': 'generate_api_14_resources_<(_target_name)',
'message': 'Generating Android API 14 resources <(_target_name)',
+ 'variables' : {
+ 'res_v14_additional_options': [],
+ },
+ 'conditions': [
+ ['res_v14_verify_only == 1', {
+ 'variables': {
+ 'res_v14_additional_options': ['--verify-only']
+ },
+ }],
+ ],
'inputs': [
'<(DEPTH)/build/android/gyp/util/build_utils.py',
'<(DEPTH)/build/android/gyp/generate_v14_compatible_resources.py',
@@ -198,6 +209,7 @@
'--res-dir=<(res_dir)',
'--res-v14-compatibility-dir=<(res_v14_compatibility_dir)',
'--stamp', '<(res_v14_compatibility_stamp)',
+ '<@(res_v14_additional_options)',
]
},
],
« no previous file with comments | « build/android/gyp/generate_v14_compatible_resources.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698