summaryrefslogtreecommitdiff
path: root/java/sdk.go
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2020-09-30 15:17:25 +0100
committer Anton Hansson <hansson@google.com> 2021-03-04 08:11:48 +0000
commit5a6cfa060b81a50dbf9acdc32f99413655518bd8 (patch)
tree19e956694525135776b31e8d731f3611a2f9354d /java/sdk.go
parentf17a64cd602ae6f18d0aff76ca56f8493db74dee (diff)
Add support for using sdk_version: "module_<ver>"
Fixes a panic when trying to build something with sdk_version: "module_30". Change-Id: I5b625eee45130cc288e3082d05fe45c9d006d0b6 Test: m nothing Merged-In: I9b2ce50957f59e2bead335ffa58888e15cda1f78
Diffstat (limited to 'java/sdk.go')
-rw-r--r--java/sdk.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/sdk.go b/java/sdk.go
index 6c1665180..5a6c53050 100644
--- a/java/sdk.go
+++ b/java/sdk.go
@@ -215,7 +215,7 @@ func (s sdkSpec) usePrebuilt(ctx android.EarlyModuleContext) bool {
return ctx.Config().UnbundledBuildUsePrebuiltSdks()
} else if s.version.isNumbered() {
// sanity check
- if s.kind != sdkPublic && s.kind != sdkSystem && s.kind != sdkTest {
+ if s.kind != sdkPublic && s.kind != sdkSystem && s.kind != sdkTest && s.kind != sdkModule {
panic(fmt.Errorf("prebuilt SDK is not not available for sdkKind=%q", s.kind))
return false
}