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

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

Issue 2699963002: Plumb bootclasspath GN -> Android Studio (Closed)
Patch Set: Created 3 years, 10 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/gyp/write_build_config.py ('k') | no next file » | 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 e1a11e23e7b2156c40eb796b095320e10c5ff32f..d2d9f998b3d7d387b9a38ae1dd94f46d1b9c3461 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -353,6 +353,12 @@ template("write_build_config") {
invoker.main_class,
]
}
+ if (defined(invoker.alternative_android_sdk_ijar)) {
+ args += [
+ "--bootclasspath",
+ rebase_path(invoker.alternative_android_sdk_ijar, root_build_dir),
+ ]
+ }
if (current_toolchain != default_toolchain) {
# This has to be a built-time error rather than a GN assert because many
# packages have a mix of java and non-java targets. For example, the
@@ -2307,6 +2313,7 @@ if (enable_java_templates) {
write_build_config(build_config_target_name) {
forward_variables_from(invoker,
[
+ "alternative_android_sdk_ijar",
"gradle_treat_as_prebuilt",
"input_jars_paths",
"main_class",
« no previous file with comments | « build/android/gyp/write_build_config.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698