commit 87890b22b64138503073057f367402c619f86ee2
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sun Jan 05 19:15:24 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sun Jan 05 19:15:24 2020 +0000
tree a532999541a4853aa3f1ac011d276e2cbb2d300d
parent 09d2a80df9574a6f8684db4622762684aae135ee
parent 786d41db85d5f1f95e5f6daf07f279b62bbb1a3e

Merge "java_sdk_library: Ensure that stubs library is not installed" am: 17cf0ab3bc am: 786d41db85

Change-Id: Ied771bad433818d035e66dfc2ef6a4188280aff7

java/sdk_library.go

diff --git a/java/sdk_library.go b/java/sdk_library.go
index 057586f..4492e3f 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -446,6 +446,7 @@
 	props := struct {
 		Name                *string
 		Srcs                []string
+		Installable         *bool
 		Sdk_version         *string
 		System_modules      *string
 		Libs                []string
@@ -475,6 +476,7 @@
 	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() {