StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refactor java compileDex" am: 9eb51fc9d4 am: 46971c5469

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

Change-Id: I574bbe46916d6e268956732f37022ba5f464fcaa
This commit is contained in:
Liz Kammer
2020-08-06 13:10:52 +00:00
committed by Automerger Merge Worker
parent e5949952fb 46971c5469
commit 898ed67ecd
5 changed files with 112 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/sdk_library.go
View File

@@ -1115,6 +1115,7 @@ func (module *SdkLibrary) createImplLibrary(mctx android.DefaultableHookContext)
&module.properties,
&module.protoProperties,
&module.deviceProperties,
&module.dexProperties,
&module.dexpreoptProperties,
&module.linter.properties,
&props,
@@ -1179,8 +1180,8 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.DefaultableHookContext
// We compile the stubs for 1.8 in line with the main android.jar stubs, and potential
// interop with older developer tools that don't support 1.9.
props.Java_version = proptools.StringPtr("1.8")
if module.deviceProperties.Compile_dex != nil {
props.Compile_dex = module.deviceProperties.Compile_dex
if module.dexProperties.Compile_dex != nil {
props.Compile_dex = module.dexProperties.Compile_dex
}
// Dist the class jar artifact for sdk builds.