diff options
| author |  Greg Estren <gregce@google.com> | 2016-09-30 19:41:15 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-10-04 08:53:14 +0000 |
| commit | bba8f91a309e9c715ac8a1ac76821247f4887d50 (patch) | |
| tree | 1674a63496c1a1fd601674bac31af8d89b84c228 /src/main/java/com/google/devtools/build/lib | |
| parent | 22ebfb834c9e79fec4f5ff39a3599af00130ca8f (diff) | |
Default host configuration's --fat_apk_cpu to the empty list.
It doesn't make sense to split a host Android rule's deps down fat APK settings.
--
MOS_MIGRATED_REVID=134814698
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java | 1 |
1 files changed, 1 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 73f13d4db9..5ea1d887fd 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 @@ -431,6 +431,7 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { Options host = (Options) super.getHost(fallback); host.androidCrosstoolTop = androidCrosstoolTop; host.sdk = sdk; + host.fatApkCpus = ImmutableList.<String>of(); // Fat APK archs don't apply to the host. return host; } |