Merge "java_sdk_library: Ensure that stubs library is not installed"

am: 17cf0ab3bc

Change-Id: I5c34740e8d41d42339ed424b2e0bd609486ce54d
This commit is contained in:
Paul Duffin 2020-01-05 11:03:16 -08:00 committed by android-build-merger
commit 786d41db85

View file

@ -446,6 +446,7 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.LoadHookContext, apiSc
props := struct {
Name *string
Srcs []string
Installable *bool
Sdk_version *string
System_modules *string
Libs []string
@ -475,6 +476,7 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.LoadHookContext, apiSc
sdkVersion := module.sdkVersionForStubsLibrary(mctx, apiScope)
props.Sdk_version = proptools.StringPtr(sdkVersion)
props.System_modules = module.Library.Module.deviceProperties.System_modules
props.Installable = proptools.BoolPtr(false)
props.Libs = module.sdkLibraryProperties.Stub_only_libs
// Unbundled apps will use the prebult one from /prebuilts/sdk
if mctx.Config().UnbundledBuildUsePrebuiltSdks() {