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

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

Issue 1291793007: GN(android): Add scripts & runtime logic for installing _managed apks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-managed-install
Patch Set: fix compile Created 5 years, 4 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/pylib/device/device_utils.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 613cb077ff43b074f7d45a483bc7b7d026467806..f974812c0c703d065e130c4a62a08047f9623783 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -1226,9 +1226,7 @@ template("java_library_impl") {
}
_java_files = []
- if (defined(invoker.java_files)) {
- _java_files = invoker.java_files
- } else if (defined(invoker.DEPRECATED_java_in_dir)) {
+ if (defined(invoker.DEPRECATED_java_in_dir)) {
_src_dir = invoker.DEPRECATED_java_in_dir + "/src"
_src_dir_exists = exec_script("//build/dir_exists.py",
[ rebase_path(_src_dir, root_build_dir) ],
@@ -1237,16 +1235,20 @@ template("java_library_impl") {
"In GN, java_in_dir should be the fully specified java directory " +
"(i.e. including the trailing \"/src\")")
- _java_files_build_rel = exec_script(
- "//build/android/gyp/find.py",
- [
- "--pattern",
- "*.java",
- rebase_path(invoker.DEPRECATED_java_in_dir, root_build_dir),
- ],
- "list lines")
+ _java_files_build_rel =
+ exec_script("//build/android/gyp/find.py",
+ [
+ "--pattern",
+ "*.java",
+ rebase_path(invoker.DEPRECATED_java_in_dir,
+ root_build_dir),
+ ],
+ "list lines")
_java_files = rebase_path(_java_files_build_rel, ".", root_build_dir)
}
+ if (defined(invoker.java_files)) {
+ _java_files += invoker.java_files
+ }
assert(_java_files != [] || _srcjar_deps != [] || _srcjars != [])
_compile_java_target = "${_template_name}__compile_java"
« no previous file with comments | « build/android/pylib/device/device_utils.py ('k') | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698