From cf4dd4c1df5ca2d91e6fa097657826eced116d21 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Thu, 21 May 2020 09:21:57 +0100 Subject: [PATCH] Build java_sdk_library stubs with language level 8 This is in line with the main android stubs (android.jar). I discovered the difference since we want to merge some java_sdk_libraries into the android.jar files, but I believe the rationale for compiling it with version 8 applies to all stubs (we don't want level 9-language features because some tooling may be stuck with version 8). Bug: 144149403 Test: presubmit (checkbuild) Change-Id: I9439ed516dda68ef516ff08d1c6045de3d3c1c0e --- java/sdk_library.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/sdk_library.go b/java/sdk_library.go index 61bb106d8..9d5c7b64f 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -792,7 +792,9 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.DefaultableHookContext props.Product_variables.Pdk.Enabled = proptools.BoolPtr(false) props.Openjdk9.Srcs = module.properties.Openjdk9.Srcs 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 { props.Compile_dex = module.deviceProperties.Compile_dex }