From ab8da5dd53b75dd32acb4e4eea5886dcc0315fd8 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 7 Feb 2020 16:12:04 +0000 Subject: [PATCH] java_sdk_library - pass patch_module through to stubs library When building java.lang classes it is necessary to compile them using patch_module: "java.base". This change causes patch_module to be passed through to the java_library created to compile the stubs to allow this to be used to generate stubs for java.lang. Test: m droid Change-Id: I7c27953a5d782eeedd7f25e849ab444d28e28228 --- java/sdk_library.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/sdk_library.go b/java/sdk_library.go index f1c565fd0..4b88b3f03 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -455,6 +455,7 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.LoadHookContext, apiSc Installable *bool Sdk_version *string System_modules *string + Patch_module *string Libs []string Soc_specific *bool Device_specific *bool @@ -479,6 +480,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.Patch_module = module.Library.Module.properties.Patch_module props.Installable = proptools.BoolPtr(false) props.Libs = module.sdkLibraryProperties.Stub_only_libs props.Product_variables.Pdk.Enabled = proptools.BoolPtr(false)