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

Merge "Set sdk_version for prebuilt_api to scope" am: 40be9bb8e1

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

Change-Id: I55bdb4e0cf2ffb7de44d715e7a94b4250b0b4c3c
This commit is contained in:
Liz Kammer
2020-07-14 18:36:38 +00:00
committed by Automerger Merge Worker
parent 76ad7335d2 40be9bb8e1
commit ae1efd5997
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/prebuilt_apis.go
View File

@@ -83,8 +83,7 @@ func createImport(mctx android.LoadHookContext, module string, scope string, api
}{} }{}
props.Name = proptools.StringPtr(prebuiltApiModuleName(mctx, module, scope, apiver)) props.Name = proptools.StringPtr(prebuiltApiModuleName(mctx, module, scope, apiver))
props.Jars = append(props.Jars, path) props.Jars = append(props.Jars, path)
// TODO(hansson): change to scope after migration is done. props.Sdk_version = proptools.StringPtr(scope)
props.Sdk_version = proptools.StringPtr("current")
props.Installable = proptools.BoolPtr(false) props.Installable = proptools.BoolPtr(false)
mctx.CreateModule(ImportFactory, &props) mctx.CreateModule(ImportFactory, &props)