Various odds and ends in preparation for adding the Android rules to BazelRuleClassProvider:

- Add stub targets to tools/android/BUILD
- Make Constants.ANDROID_DEFAULT_SDK non-constant so that the classfile can be replaced in the .jar
- Make AndroidTools complain if --android_sdk does not point to an android_sdk rule.
- Make the default visibility in the BUILD file generated by android_sdk_repository public

--
MOS_MIGRATED_REVID=95816158

1 files changed, 6 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidTools.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidTools.java
index 5e57c27e04..f7a2ab8783 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidTools.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidTools.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.rules.android;
 
+import com.google.devtools.build.lib.Constants;
 import com.google.devtools.build.lib.actions.Action;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.FilesToRunProvider;
@@ -55,6 +56,11 @@ public class AndroidTools {
     AndroidSdkProvider androidSdk = androidSdkDep == null
         ? null
         : androidSdkDep.getProvider(AndroidSdkProvider.class);
+    if (androidSdk == null && !Constants.ANDROID_ALLOW_SDK_FILEGROUP) {
+      ruleContext.ruleError(
+          "No Android SDK found. Use the --android_sdk command line option to specify one.");
+      return null;
+    }
 
     return new AndroidTools(
         ruleContext,