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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2759683002: Updating android_aar_prebuilt rule to prevent unneeded args if the res folder is empty.
Patch Set: Adding name to AUTHORS file Created 3 years, 9 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 | « AUTHORS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index ba8930f693bc7cfe469aecc4ccabc5382d458d2d..bf522c6f828b7e2674d78db9f74c41526b283a2d 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -2813,9 +2813,11 @@ if (enable_java_templates) {
}
deps += [ ":$_unpack_target_name" ]
resource_dirs = []
- generated_resource_dirs = [ "${_output_path}/res" ]
- generated_resource_files =
- rebase_path(_scanned_files.resources, "", _output_path)
+ if (_scanned_files.resources != []) {
+ generated_resource_dirs = [ "${_output_path}/res" ]
+ generated_resource_files =
+ rebase_path(_scanned_files.resources, "", _output_path)
+ }
android_manifest_dep = ":$_unpack_target_name"
android_manifest = "${_output_path}/AndroidManifest.xml"
if (_scanned_files.has_r_text_file) {
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698