Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ce1e81b authored by Paul Duffin's avatar Paul Duffin Committed by Anton Hansson
Browse files

java_sdk_library: Add annotations_enabled property 

Passes it through to droidstubs.

Bug: 155164730
Test: m droid
Change-Id: I8b23a959ce33716dfc4572488a1fd3f6bab73a17
parent 0bd88d0b

java/sdk_library.go

+10 −0
Original line number Diff line number Diff line
@@ -379,6 +379,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
@@ -789,6 +792,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.Product_variables.Pdk.Enabled = proptools.BoolPtr(false)

	props.Openjdk9.Srcs = module.properties.Openjdk9.Srcs

	props.Openjdk9.Javacflags = module.properties.Openjdk9.Javacflags
@@ -822,6 +830,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
@@ -872,6 +881,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