diff options
| author | 2020-09-02 11:36:35 +0000 | |
|---|---|---|
| committer | 2020-09-02 11:36:35 +0000 | |
| commit | e0b81e4472a71743c2a80a16d4617352a5fa7f86 (patch) | |
| tree | 3b673a455ed434c30b5ec7d06975de2a334cd4f0 /java/sdk_library.go | |
| parent | 21928dbbddfee5dcba6088f8bfc09421f0c74087 (diff) | |
| parent | e22c2ab14ba003557e81d8b195f76be17cdebfd3 (diff) | |
Merge "java_sdk_library: Add annotations_enabled property"
Diffstat (limited to 'java/sdk_library.go')
| -rw-r--r-- | java/sdk_library.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index 1152ac375..72e61ae60 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -419,6 +419,9 @@ type sdkLibraryProperties struct { // $(location <label>): the path to the droiddoc_option_files with name <label> Droiddoc_options []string + // is set to true, Metalava will allow framework SDK to contain annotations. + Annotations_enabled *bool + // a list of top-level directories containing files to merge qualifier annotations // (i.e. those intended to be included in the stubs written) from. Merge_annotations_dirs []string @@ -1159,6 +1162,11 @@ 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. + if proptools.Bool(module.sdkLibraryProperties.Annotations_enabled) { + props.Libs = append(props.Libs, "stub-annotations") + } props.Openjdk9.Srcs = module.properties.Openjdk9.Srcs props.Openjdk9.Javacflags = module.properties.Openjdk9.Javacflags // We compile the stubs for 1.8 in line with the main android.jar stubs, and potential @@ -1193,6 +1201,7 @@ 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 @@ -1243,6 +1252,7 @@ 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 = module.sdkLibraryProperties.Annotations_enabled props.Merge_annotations_dirs = module.sdkLibraryProperties.Merge_annotations_dirs props.Merge_inclusion_annotations_dirs = module.sdkLibraryProperties.Merge_inclusion_annotations_dirs |