Add a tools/android/jack package to the Bazel tree so that Android rules actually work. This is a temporary measure until these targets are integrated into android_sdk .

Also make handling invalid tools/android/jack packages in JackCompilationHelper a bit more robust.

--
MOS_MIGRATED_REVID=96202009

1 files changed, 6 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
index dd650e04a6..0f52356e57 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
@@ -99,6 +99,9 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
               getTransitiveResourceContainers(ruleContext, ImmutableList.of("resources", "deps")),
               javaCommon, androidCommon, javaSemantics, androidSemantics, tools,
               ImmutableList.<String>of("deps"));
+      if (builder == null) {
+        return null;
+      }
       return builder.build();
     } catch (RuleConfigurationException e) {
       Preconditions.checkArgument(ruleContext.hasErrors(),
@@ -256,6 +259,9 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
     JavaTargetAttributes resourceClasses = androidCommon.init(
         javaSemantics, androidSemantics, tools, resourceApk, AndroidIdlProvider.EMPTY,
         ruleContext.getConfiguration().isCodeCoverageEnabled(), true);
+    if (resourceClasses == null) {
+      return null;
+    }
 
     Artifact deployJar = createDeployJar(ruleContext, javaSemantics, androidCommon, resourceClasses,
         ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_BINARY_DEPLOY_JAR));