Make --android_crosstool_top default to the android_ndk_repository specified in the WORKSPACE file.

The error reporting if an android_ndk_repository rule is present is not very user-friendly (it just uses the non-Android toolchain, resulting in compile errors) but given that --android_crosstool_top is an interim solution until we get reasonable multi-platform support, I suppose it's fine.

As a side effect, instead of prefixing fat APK output directories with "fat-apk-", we prefix Android output directories with "android-".

This makes it possible to build Android apps with zero command line options. Rejoice!

--
MOS_MIGRATED_REVID=98624120

1 files changed, 3 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/Constants.java b/src/main/java/com/google/devtools/build/lib/Constants.java
index edcdea3aec..b178b826a7 100644
--- a/src/main/java/com/google/devtools/build/lib/Constants.java
+++ b/src/main/java/com/google/devtools/build/lib/Constants.java
@@ -19,6 +19,8 @@ import com.google.common.collect.ImmutableSet;
 
 /**
  * Various constants required by Bazel.
+ * <p>The extra {@code .toString()} calls are there so that javac doesn't inline these constants
+ * so that we can replace this class file within the Bazel binary.
  */
 public class Constants {
   private Constants() {
@@ -81,5 +83,6 @@ public class Constants {
   public static final ImmutableSet<String> IOS_DEVICE_RULE_CLASSES = ImmutableSet.of("ios_device");
 
   public static final String ANDROID_DEFAULT_SDK = "//external:android/sdk".toString();
+  public static final String ANDROID_DEFAULT_CROSSTOOL = "//external:android/crosstool".toString();
   public static final String ANDROID_DEP_PREFIX = "//external:android/".toString();
 }