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

Unified Diff: build/java.gypi

Issue 14476011: [Android] Auto-generate API 14 resources from the existing API 17 resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed Newton's comments and polished. Created 7 years, 8 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
Index: build/java.gypi
diff --git a/build/java.gypi b/build/java.gypi
index fdcbe576652a7438bd60734f59797f7e171c5215..26e604ff056e6c6bd28eef9c526062c250a2caf6 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -83,6 +83,7 @@
'variables': {
'res_dir': '<(java_in_dir)/res',
'res_crunched_dir': '<(intermediate_dir)/res_crunched',
+ 'res_mirrored_dir': '<(intermediate_dir)/res_mirrored',
'res_input_dirs': ['<(res_dir)', '<@(res_extra_dirs)'],
'resource_input_paths': ['<!@(find <(res_dir) -type f)'],
'R_dir': '<(intermediate_dir)/java_R',
@@ -105,7 +106,9 @@
# Dependent APKs include this target's resources via
# additional_res_dirs, additional_res_packages, and
# additional_R_text_files.
- 'additional_res_dirs': ['<(res_crunched_dir)', '<@(res_input_dirs)'],
+ 'additional_res_dirs': ['<(res_crunched_dir)',
+ '<(res_mirrored_dir)',
newt (away) 2013/04/25 00:41:24 move res_mirrored_dir after res_input_dirs. this
Kibeom Kim (inactive) 2013/04/25 01:49:35 Done.
+ '<@(res_input_dirs)'],
'additional_res_packages': ['<(R_package)'],
'additional_R_text_files': ['<(R_text_file)'],
},
@@ -160,6 +163,8 @@
'--res-dirs', '>(all_res_dirs)',
'--crunch-input-dir', '>(res_dir)',
'--crunch-output-dir', '<(res_crunched_dir)',
+ '--res-mirror-input-dir', '>(res_dir)',
newt (away) 2013/04/25 00:41:24 this is a gyp bug :(
Kibeom Kim (inactive) 2013/04/25 01:49:35 Done.
+ '--res-mirror-output-dir', '<(res_mirrored_dir)',
'--android-manifest', '<(android_manifest)',
'--non-constant-id',
'--custom-package', '<(R_package)',
« build/android/gyp/mirror_resources.py ('K') | « build/android/gyp/process_resources.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698