StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Inclusive fix: Replace sanity to validation in java/sdk.go" am: 3d8e506c3a am: ffdfccd54c am: 375337b0c8 am: 0a185df8f4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374701

Change-Id: Ibf4ed59716d186f48eeb18395e96da80f2f44462
This commit is contained in:
Treehugger Robot
2020-07-29 00:48:34 +00:00
committed by Automerger Merge Worker
parent dc93b18945 0a185df8f4
commit a5d765fba8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/sdk.go
View File

@@ -214,7 +214,7 @@ func (s sdkSpec) usePrebuilt(ctx android.EarlyModuleContext) bool {
// "current" can be built from source and be from prebuilt SDK // "current" can be built from source and be from prebuilt SDK
return ctx.Config().UnbundledBuildUsePrebuiltSdks() return ctx.Config().UnbundledBuildUsePrebuiltSdks()
} else if s.version.isNumbered() { } else if s.version.isNumbered() {
// sanity check // validation check
if s.kind != sdkPublic && s.kind != sdkSystem && s.kind != sdkTest { if s.kind != sdkPublic && s.kind != sdkSystem && s.kind != sdkTest {
panic(fmt.Errorf("prebuilt SDK is not not available for sdkKind=%q", s.kind)) panic(fmt.Errorf("prebuilt SDK is not not available for sdkKind=%q", s.kind))
return false return false