diff options
| author | 2020-06-05 18:04:56 +0000 | |
|---|---|---|
| committer | 2020-06-05 18:04:56 +0000 | |
| commit | 79fe805e05d036454f352d2d45d0106d75face7e (patch) | |
| tree | b4bb39d94337e33fe0e8835b50fca06511de0767 /java | |
| parent | 5ac7fad75905aa53274e8f46a665fb34c2390cdb (diff) | |
| parent | 83509b549c11c753778834822afefadbcfc7e62e (diff) | |
Merge "Build java_sdk_library stubs with language level 8"
Diffstat (limited to 'java')
| -rw-r--r-- | java/sdk_library.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index 67b0bd603..ee62390e7 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1113,7 +1113,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 } |