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

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

Change-Id: I058d20004ba9199bb8dd2cd1ca3609bb6ff1aa82
This commit is contained in:
Liz Kammer
2020-07-14 18:57:52 +00:00
committed by Automerger Merge Worker

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.Jars = append(props.Jars, path)
// TODO(hansson): change to scope after migration is done.
props.Sdk_version = proptools.StringPtr("current")
props.Sdk_version = proptools.StringPtr(scope)
props.Installable = proptools.BoolPtr(false)
mctx.CreateModule(ImportFactory, &props)