diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/sdk_library.go | 9 | ||||
| -rw-r--r-- | java/testing.go | 1 |
2 files changed, 3 insertions, 7 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index f503e13bc..0598e814e 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1072,13 +1072,12 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.DefaultableHookContext props.Patch_module = module.properties.Patch_module props.Installable = proptools.BoolPtr(false) props.Libs = module.sdkLibraryProperties.Stub_only_libs - // The stub-annotations library contains special versions of the annotations - // with CLASS retention policy, so that they're kept around for kotlin. - props.Libs = append(props.Libs, "stub-annotations") 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 } @@ -1108,7 +1107,6 @@ func (module *SdkLibrary) createStubsSourcesAndApi(mctx android.DefaultableHookC Arg_files []string Args *string Java_version *string - Annotations_enabled *bool Merge_annotations_dirs []string Merge_inclusion_annotations_dirs []string Generate_stubs *bool @@ -1159,7 +1157,6 @@ func (module *SdkLibrary) createStubsSourcesAndApi(mctx android.DefaultableHookC props.Aidl.Local_include_dirs = module.deviceProperties.Aidl.Local_include_dirs props.Java_version = module.properties.Java_version - props.Annotations_enabled = proptools.BoolPtr(true) props.Merge_annotations_dirs = module.sdkLibraryProperties.Merge_annotations_dirs props.Merge_inclusion_annotations_dirs = module.sdkLibraryProperties.Merge_inclusion_annotations_dirs diff --git a/java/testing.go b/java/testing.go index 4872af507..d6a2446ab 100644 --- a/java/testing.go +++ b/java/testing.go @@ -176,7 +176,6 @@ func GatherRequiredDepsForTest() string { "kotlin-stdlib-jdk7", "kotlin-stdlib-jdk8", "kotlin-annotations", - "stub-annotations", } for _, extra := range extraModules { |