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

Commit 1b052b00 authored by Zhi Dou's avatar Zhi Dou Committed by Android Build Cherrypicker Worker
Browse files

Add UnsupportedAppUsage to java_aconfig_library dependency 

Generated flag requires UnsupportedAppUsage annotation to expose the
flag to CTS tests.

Bug: 301272559
Test: presubit
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5e2c96a93b4c16b224c090570a10697400a42c0a)
Merged-In: I90c87596ca80766ece429ddee1b45723b01d2760
Change-Id: I90c87596ca80766ece429ddee1b45723b01d2760
parent d56338cc

aconfig/java_aconfig_library.go

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) DepsMutator(module *ja 


	// Add aconfig-annotations-lib as a dependency for the optimization / code stripping annotations

	module.AddSharedLibrary("aconfig-annotations-lib")

	// TODO(b/303773055): Remove the annotation after access issue is resolved.

	module.AddSharedLibrary("unsupportedappusage")

}



func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) GenerateSourceJarBuildActions(module *java.GeneratedJavaLibraryModule, ctx android.ModuleContext) android.Path {

java/testing.go

+1 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ func gatherRequiredDepsForTest() string { 
		"stub-annotations",



		"aconfig-annotations-lib",

		"unsupportedappusage",

	}



	for _, extra := range extraModules {