Respect --incremental_dexing flag in host configuration.
--
MOS_MIGRATED_REVID=139400647
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 d819df0..cab35ff 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
@@ -302,12 +302,11 @@
+ "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.")
+ help = "This flag is deprecated in favor of applying --incremental_dexing to both host "
+ + "and target configuration. This flag will be removed in a future release.")
public boolean hostIncrementalDexing;
// Do not use on the command line.
@@ -426,7 +425,7 @@
host.fatApkCpus = ImmutableList.<String>of(); // Fat APK archs don't apply to the host.
host.desugarJava8 = desugarJava8;
- host.incrementalDexing = hostIncrementalDexing;
+ host.incrementalDexing = incrementalDexing;
host.incrementalDexingBinaries = incrementalDexingBinaries;
host.nonIncrementalPerTargetDexopts = nonIncrementalPerTargetDexopts;
host.dexoptsSupportedInIncrementalDexing = dexoptsSupportedInIncrementalDexing;
