Check for the presence of an AndroidSdkProvider in JackAspect.

If no AndroidSdkProvider is present, JackAspect exits with an error
instead of throwing and thus crashing Bazel. This is acceptable; the
Android rules which JackAspect is attached to will do the same.

--
MOS_MIGRATED_REVID=120150996

1 files changed, 3 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/JackAspect.java b/src/main/java/com/google/devtools/build/lib/rules/android/JackAspect.java
index a167f38ba9..60a912d774 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/JackAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/JackAspect.java
@@ -63,6 +63,9 @@ public final class JackAspect implements NativeAspectFactory, ConfiguredAspectFa
         ruleContext
             .getAnalysisEnvironment()
             .getDerivedArtifact(jackLibraryPath, ruleContext.getBinOrGenfilesDirectory());
+    if (!AndroidSdkProvider.verifyPresence(ruleContext)) {
+      return null;
+    }
     AndroidSdkProvider androidSdk = AndroidSdkProvider.fromRuleContext(ruleContext);
     JackCompilationHelper jackHelper =
         new JackCompilationHelper.Builder()