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, 2 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java
index 0a927afb15..9f405e7b53 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java
@@ -151,7 +151,7 @@ public class ObjcCommandLineOptions extends FragmentOptions {
   // transitions for this purpose.
   // TODO(bazel-team): Remove this once we have dynamic configurations but make sure that different
   // configurations (e.g. by min os version) always use different output paths.
-  @Option(name = "DO_NOT_USE_configuration_distinguisher",
+  @Option(name = "iOS configuration distinguisher",
       defaultValue = "UNKNOWN",
       converter = ConfigurationDistinguisherConverter.class,
       category = "undocumented")
@@ -189,7 +189,7 @@ public class ObjcCommandLineOptions extends FragmentOptions {
   public static final class ConfigurationDistinguisherConverter
       extends EnumConverter<ConfigurationDistinguisher> {
     public ConfigurationDistinguisherConverter() {
-      super(ConfigurationDistinguisher.class, "configuration distinguisher");
+      super(ConfigurationDistinguisher.class, "Objective C configuration distinguisher");
     }
   }
 }