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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/java.gypi

Issue 11819047: Update Android build to API level 17 and SDK Tools version 21 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 11 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/process_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 a13c88f852fd9880c90bbf53f44cab683a159a04..f9581320b5d6366eb70743f05b44d22ffc2d5de4 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -73,6 +73,7 @@
'crunched_res_dir': '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/res',
'R_dir': '<(SHARED_INTERMEDIATE_DIR)/<(package_name)/java_R',
'R_file': '<(R_dir)/<(R_package_relpath)/R.java',
+ 'R_text_file': '<(R_dir)/R.txt',
'generated_src_dirs': ['<(R_dir)'],
'additional_input_paths': ['<(R_file)'],
},
@@ -82,6 +83,7 @@
# generated_R_dirs and additional_R_files.
'generated_R_dirs': ['<(R_dir)'],
'additional_R_files': ['<(R_file)'],
+ 'additional_R_text_files': ['<(R_text_file)'],
# Dependent APKs include this target's resources via
# additional_res_dirs and additional_res_packages.
« no previous file with comments | « build/android/process_resources.py ('k') | build/java_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698