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

Unified Diff: build/config/android/rules.gni

Issue 1104703003: Actually use --extra-r-text-files in process_resources.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use correct R class in SyncCustomizationFragmentTest Created 5 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/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index b1b23b0220ff355a6183c05589c795d1805cc1e9..efe0a003ea799e8033814352b888e99ba4b6d7a1 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -548,12 +548,14 @@ template("android_resources") {
base_path = "$target_gen_dir/$target_name"
zip_path = base_path + ".resources.zip"
srcjar_path = base_path + ".srcjar"
+ r_text_path = base_path + "_R.txt"
build_config = base_path + ".build_config"
write_build_config("${target_name}__build_config") {
type = "android_resources"
resources_zip = zip_path
srcjar = srcjar_path
+ r_text = r_text_path
if (defined(invoker.deps)) {
deps = invoker.deps
}
@@ -1306,6 +1308,7 @@ template("android_apk") {
final_deps += [ ":${_template_name}__process_resources" ]
process_resources("${_template_name}__process_resources") {
srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
+ r_text_path = "${target_gen_dir}/${target_name}_R.txt"
android_manifest = _android_manifest
resource_dirs = [ "//build/android/ant/empty/res" ]
zip_path = resources_zip_path

Powered by Google App Engine
This is Rietveld 408576698