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

Merge "Build java_sdk_library stubs with language level 8" into rvc-dev

Browse Source
This commit is contained in:
Anton Hansson
2020-05-25 10:22:38 +00:00
committed by Android (Google) Code Review
parent 83ef435005 cf4dd4c1df
commit 0cc1c31f9a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/sdk_library.go
View File

@@ -792,7 +792,9 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.DefaultableHookContext
props.Product_variables.Pdk.Enabled = proptools.BoolPtr(false) props.Product_variables.Pdk.Enabled = proptools.BoolPtr(false)
props.Openjdk9.Srcs = module.properties.Openjdk9.Srcs props.Openjdk9.Srcs = module.properties.Openjdk9.Srcs
props.Openjdk9.Javacflags = module.properties.Openjdk9.Javacflags props.Openjdk9.Javacflags = module.properties.Openjdk9.Javacflags
props.Java_version = module.properties.Java_version // 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 { if module.deviceProperties.Compile_dex != nil {
props.Compile_dex = module.deviceProperties.Compile_dex props.Compile_dex = module.deviceProperties.Compile_dex
} }