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

Commit eea1ab3a authored by Zhi Dou's avatar Zhi Dou Committed by Gerrit Code Review
Browse files

Merge "replace aconfig_storage_reader_java to aconfig_storage_stub" into main

parents 0ba56bf1 aed2e74b

aconfig/codegen/java_aconfig_library.go

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) DepsMutator(module *ja 
		module.AddSharedLibrary("aconfig-annotations-lib")

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

		module.AddSharedLibrary("unsupportedappusage")

		module.AddSharedLibrary("aconfig_storage_reader_java")

		module.AddSharedLibrary("aconfig_storage_stub")

	}

}

android/container.go

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ var globallyAllowlistedDependencies = []string{ 


	// TODO(b/363016634): Remove from the allowlist when the module is converted

	// to java_sdk_library and the java_aconfig_library modules depend on the stub.

	"aconfig_storage_reader_java",

	"aconfig_storage_stub",



	// framework-res provides core resources essential for building apps and system UI.

	// This module is implicitly added as a dependency for java modules even when the

java/testing.go

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



		"aconfig-annotations-lib",

		"aconfig_storage_reader_java",

		"aconfig_storage_stub",

		"unsupportedappusage",

	}