From 6a5669a9b00ed4113ee3945c4a74c35c17a70728 Mon Sep 17 00:00:00 2001 From: ajmichael Date: Fri, 1 Dec 2017 13:25:19 -0800 Subject: Make AndroidSdkProvider.verifyPresence throw. All call sites were just returning null if it failed anyways. RELNOTES: None PiperOrigin-RevId: 177632366 --- .../com/google/devtools/build/lib/rules/android/AndroidLibrary.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java index d5bd4cb0b6..480b4a6ab2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java @@ -175,9 +175,7 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory { validateRuleContext(ruleContext); JavaSemantics javaSemantics = createJavaSemantics(); AndroidSemantics androidSemantics = createAndroidSemantics(); - if (!AndroidSdkProvider.verifyPresence(ruleContext)) { - return null; - } + AndroidSdkProvider.verifyPresence(ruleContext); checkResourceInlining(ruleContext); NestedSetBuilder transitiveAars = NestedSetBuilder.naiveLinkOrder(); NestedSetBuilder transitiveAarArtifacts = NestedSetBuilder.stableOrder(); -- cgit v1.2.3