commit 387c610d09b99536f7f5b8ecb883d14ee6063fdd
author dchai <dchai@google.com> Tue Nov 19 10:03:06 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Nov 19 10:04:11 2019 -0800
tree 2e338b576baec11f0a2b0a955960e2da85ccb212
parent 3be8bdbe44b2eee49c10e09e1f16c8851eb3959a

Obey --incompatible_prohibit_aapt1 in host mode.

PiperOrigin-RevId: 281318734

src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java

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 93599d2..0bae2635 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
@@ -1014,6 +1014,8 @@
           oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest;
       host.persistentBusyboxTools = persistentBusyboxTools;
 
+      host.incompatibleProhibitAapt1 = incompatibleProhibitAapt1;
+
       // Unless the build was started from an Android device, host means MAIN.
       host.configurationDistinguisher = ConfigurationDistinguisher.MAIN;
       return host;