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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/java_apk.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: 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
« android_webview/javatests/AndroidManifest.xml ('K') | « build/java.gypi ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 6d391881c00ebf4ea596b3ee254724ab48ab7887..2f2c582f1e7b52675afcb99cf8eaef3090ee22fb 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -165,6 +165,7 @@
'-DJAR_NAME=<(jar_name)',
'-DPACKAGE_NAME=<(package_name)',
'-DRESOURCE_DIR=<(resource_dir)',
+ '-DADDITIONAL_R_FILES=>(additional_R_text_files)',
cjhopman 2013/01/10 18:50:29 There is a gyp variable <(additional_R_files) and
'-DADDITIONAL_RES_DIRS=>(additional_res_dirs)',
'-DADDITIONAL_RES_PACKAGES=>(additional_res_packages)',
'-DAPP_MANIFEST_VERSION_NAME=<(app_manifest_version_name)',
@@ -189,6 +190,7 @@
# listed in the AndroidManifest.xml, which is unavoidable).
'additional_res_dirs': ['<(DEPTH)/build/android/ant/empty/res'],
'additional_res_packages': ['<(R_package)'],
+ 'additional_R_text_files': ['<(PRODUCT_DIR)/<(package_name)/R.txt'],
},
}],
],
« android_webview/javatests/AndroidManifest.xml ('K') | « build/java.gypi ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698