diff options
author | 2017-12-01 13:25:19 -0800 | |
---|---|---|
committer | 2017-12-01 13:27:27 -0800 | |
commit | 6a5669a9b00ed4113ee3945c4a74c35c17a70728 (patch) | |
tree | 277156f41b9a0bbe925967e28ec3066871d58c3e /src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java | |
parent | 062da5cbb5848dbfa1cf8bae028b06313a84ef0d (diff) |
Make AndroidSdkProvider.verifyPresence throw.
All call sites were just returning null if it failed anyways.
RELNOTES: None
PiperOrigin-RevId: 177632366
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java | 4 |
1 files changed, 1 insertions, 3 deletions
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<Aar> transitiveAars = NestedSetBuilder.naiveLinkOrder(); NestedSetBuilder<Artifact> transitiveAarArtifacts = NestedSetBuilder.stableOrder(); |