From fb6ae5bc73ecaf00e5b2be1ed9640bdd1f21c22e Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 30 Sep 2020 15:17:25 +0100 Subject: Add support for using sdk_version: "module_" Fixes a panic when trying to build something with sdk_version: "module_30". Test: m nothing Change-Id: I9b2ce50957f59e2bead335ffa58888e15cda1f78 --- java/sdk.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/sdk.go') diff --git a/java/sdk.go b/java/sdk.go index f59926502..971791f4a 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -222,7 +222,7 @@ func (s sdkSpec) usePrebuilt(ctx android.EarlyModuleContext) bool { return ctx.Config().AlwaysUsePrebuiltSdks() } else if s.version.isNumbered() { // validation 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 } -- cgit v1.2.3-59-g8ed1b