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

Commit 34a20727 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Revert "Default annotations_enabled to true for sdk_library"" into rvc-dev am: 83ef4350 

Change-Id: If4d96a85f6fe26633e5f3491b2ce614c454e328f
parents 8a33c1d8 83ef4350

java/sdk_library.go

+0 −5
Original line number Diff line number Diff line
@@ -789,9 +789,6 @@ 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
@@ -825,7 +822,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
@@ -876,7 +872,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

java/testing.go

+0 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ func GatherRequiredDepsForTest() string { 
		"kotlin-stdlib-jdk7",

		"kotlin-stdlib-jdk8",

		"kotlin-annotations",

		"stub-annotations",

	}



	for _, extra := range extraModules {

sdk/java_sdk_test.go

+3 −6
Original line number Diff line number Diff line
@@ -72,9 +72,6 @@ java_import { 
	name: "framework", 

	sdk_version: "none",

}

java_library {

	name: "stub-annotations",

}

` + bp



	return testSdkWithFs(t, bp, fs)