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

Unified Diff: build/java.gypi

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 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/isolate.gypi ('k') | build/java_aidl.gypi » ('j') | 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 730fa2222a7417c1684ea6f23a40e17b058d4cb7..cee70e56760050f1eaaf89df8ff4a16e102c96f9 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -69,7 +69,7 @@
'has_java_resources%': 0,
'res_extra_dirs': [],
'res_extra_files': [],
- 'res_v14_verify_only%': 0,
+ 'res_v14_skip%': 0,
'resource_input_paths': ['>@(res_extra_files)'],
'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)',
'compile_stamp': '<(intermediate_dir)/compile.stamp',
@@ -157,8 +157,8 @@
'inputs_list_file': '>|(java_resources.<(_target_name).gypcmd >@(resource_input_paths))',
'process_resources_options': [],
'conditions': [
- ['res_v14_verify_only == 1', {
- 'process_resources_options': ['--v14-verify-only']
+ ['res_v14_skip == 1', {
+ 'process_resources_options': ['--v14-skip']
}],
],
},
@@ -176,7 +176,7 @@
'action': [
'python', '<(DEPTH)/build/android/gyp/process_resources.py',
'--android-sdk', '<(android_sdk)',
- '--android-sdk-tools', '<(android_sdk_tools)',
+ '--aapt-path', '<(android_aapt_path)',
'--non-constant-id',
'--android-manifest', '<(android_manifest)',
« no previous file with comments | « build/isolate.gypi ('k') | build/java_aidl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698