diff options
author | Googler <noreply@google.com> | 2016-09-30 22:58:19 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-10-04 08:53:18 +0000 |
commit | 292d02341ea2f6c4021b234f22ac634c0fe4da3c (patch) | |
tree | 35d1058bcd95a359d25610848134647211b9f661 | |
parent | 1b4b207170a87fc8f1ac94413ed9af424b674025 (diff) |
Extend Android Java 8 desugaring flag to host configuration. While we're at it,
also allow incremental dexing in host configuration.
--
MOS_MIGRATED_REVID=134838429
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java index 5ea1d887fd..90295a3fc5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java @@ -332,6 +332,14 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { + "Jack and Jill.") public boolean incrementalDexing; + // Do not use on the command line and instead flip this default globally. + @Option(name = "host_incremental_dexing", + defaultValue = "false", + category = "hidden", + help = "Does most of the work for dexing separately for each Jar file that's part of an " + + "Android binary built in host configuration.") + public boolean hostIncrementalDexing; + // Do not use on the command line. // The idea is that this option lets us gradually turn on incremental dexing for different // binaries. Users should rely on --noincremental_dexing to turn it off. @@ -432,6 +440,13 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { host.androidCrosstoolTop = androidCrosstoolTop; host.sdk = sdk; host.fatApkCpus = ImmutableList.<String>of(); // Fat APK archs don't apply to the host. + + host.desugarJava8 = desugarJava8; + host.incrementalDexing = hostIncrementalDexing; + host.incrementalDexingBinaries = incrementalDexingBinaries; + host.nonIncrementalPerTargetDexopts = nonIncrementalPerTargetDexopts; + host.dexoptsSupportedInIncrementalDexing = dexoptsSupportedInIncrementalDexing; + host.dexingStrategy = dexingStrategy; return host; } |