From 367ab91d607f6b094e8debc594f5278c43ff9c8b Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Mon, 23 Dec 2019 19:40:36 +0000
Subject: [PATCH] java_sdk_library: Ensure that stubs library is not installed

Bug: 145998881
Test: m checkbuild
Change-Id: Ieabe563b8894f223ba66bf8ec7bf8bf1d9ca49b1
---
 java/sdk_library.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/java/sdk_library.go b/java/sdk_library.go
index 057586f7e..4492e3fae 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -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() {