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

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

Issue 1233453010: GN: Fix support errorprone and java_binary (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn12
Patch Set: Add errorprone target only for OS=android Created 5 years, 5 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/config/android/internal_rules.gni ('k') | third_party/errorprone/BUILD.gn » ('j') | 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 0f173a82af2a69b66b31b6de3757c21d3ef0c644..960c61bd70f2847e2d076d18b56396fe6127121d 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -908,6 +908,7 @@ template("java_binary") {
testonly = invoker.testonly
}
+ supports_android = false
main_class = invoker.main_class
}
}
@@ -1079,6 +1080,7 @@ template("java_library") {
# deps: Specifies the dependencies of this target. Java targets in this list
# will be added to the javac classpath.
# jar_path: Path to the prebuilt jar.
+# jar_dep: Target that builds jar_path (optional).
# proguard_preprocess: If true, proguard preprocessing will be run. This can
# be used to remove unwanted parts of the library.
# proguard_config: Path to the proguard config for preprocessing.
@@ -1095,6 +1097,9 @@ template("java_prebuilt") {
set_sources_assignment_filter([])
java_prebuilt_impl(target_name) {
jar_path = invoker.jar_path
+ if (defined(invoker.jar_dep)) {
+ jar_dep = invoker.jar_dep
+ }
if (defined(invoker.testonly)) {
testonly = invoker.testonly
}
« no previous file with comments | « build/config/android/internal_rules.gni ('k') | third_party/errorprone/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698