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

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

Issue 2570313002: Use R.txt from AAR to generate R.java for it when building APK. (Closed)
Patch Set: Added workaround for aars with empty R.txt and no resources. Created 4 years 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/process_resources.py ('k') | build/config/android/rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 48fcbc4e71891f8a8c32cedea9a369fe1570c889..cdd9d433f954c1ef571356360972203e0639a8f7 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -2530,7 +2530,7 @@ if (enable_java_templates) {
zip_path = invoker.zip_path
srcjar_path = invoker.srcjar_path
- r_text_path = invoker.r_text_path
+ r_text_out_path = invoker.r_text_out_path
build_config = invoker.build_config
android_manifest = invoker.android_manifest
@@ -2552,7 +2552,7 @@ if (enable_java_templates) {
outputs = [
zip_path,
srcjar_path,
- r_text_path,
+ r_text_out_path,
]
_all_resource_dirs = []
@@ -2615,12 +2615,21 @@ if (enable_java_templates) {
"--resource-zip-out",
rebase_path(zip_path, root_build_dir),
"--r-text-out",
- rebase_path(r_text_path, root_build_dir),
+ rebase_path(r_text_out_path, root_build_dir),
"--dependencies-res-zips=@FileArg($rebase_build_config:resources:dependency_zips)",
"--extra-res-packages=@FileArg($rebase_build_config:resources:extra_package_names)",
"--extra-r-text-files=@FileArg($rebase_build_config:resources:extra_r_text_files)",
]
+ if (defined(invoker.r_text_in_path)) {
+ _r_text_in_path = invoker.r_text_in_path
+ inputs += [ _r_text_in_path ]
+ args += [
+ "--r-text-in",
+ rebase_path(_r_text_in_path, root_build_dir),
+ ]
+ }
+
if (non_constant_id) {
args += [ "--non-constant-id" ]
}
« no previous file with comments | « build/android/gyp/process_resources.py ('k') | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698