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

Unified Diff: build/java.gypi

Issue 291963002: Convert apk-package-resources.xml to python (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 7 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/package_resources.py ('k') | build/java_apk.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 ce778b1ae5197808f5bb8c653727acf288616869..d392206090900f2de008e00d3407ab1e3dceb6cd 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -140,9 +140,14 @@
# 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_v14_compatibility_dir)',
- '<@(res_input_dirs)'],
+ 'additional_res_dirs': [
+ # The order of these is important to ensure that the proper
+ # version (i.e. the crunched version) of resources takes
+ # precedence.
+ '<(res_crunched_dir)',
+ '<(res_v14_compatibility_dir)',
+ '<@(res_input_dirs)'
+ ],
'additional_res_packages': ['<(R_package)'],
'additional_R_text_files': ['<(R_text_file)'],
},
« no previous file with comments | « build/android/gyp/package_resources.py ('k') | build/java_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698