summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author zhidou <zhidou@google.com> 2024-11-20 03:55:07 +0000
committer zhidou <zhidou@google.com> 2024-11-21 04:59:13 +0000
commitaed2e74b6131b95f0811c2d564f51c31dad48ce2 (patch)
tree0e5a204d5c553a77ad961799fa03a61c31b0ec1b
parenta4a6ec4d89ed78a2778382f497bbbbfa8c03e6fd (diff)
replace aconfig_storage_reader_java to aconfig_storage_stub
This change replace aconfig_storage_reader_jave to aconfig_storage_stub. The former library is a normal java library, while the later is a stub library. Since we only need to provide the symbols here, the stub library is safer. Test: presubmit Change-Id: I1c098cf7ad4c0ec0d5f0b13089f04598b8f81fc3
-rw-r--r--aconfig/codegen/java_aconfig_library.go2
-rw-r--r--android/container.go2
-rw-r--r--java/testing.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/aconfig/codegen/java_aconfig_library.go b/aconfig/codegen/java_aconfig_library.go
index ebca4134c..9f399bf76 100644
--- a/aconfig/codegen/java_aconfig_library.go
+++ b/aconfig/codegen/java_aconfig_library.go
@@ -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")
}
}
diff --git a/android/container.go b/android/container.go
index 2a3777b30..4dcf02a36 100644
--- a/android/container.go
+++ b/android/container.go
@@ -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
diff --git a/java/testing.go b/java/testing.go
index cb3245ba7..0ea4e6408 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -428,7 +428,7 @@ func gatherRequiredDepsForTest() string {
"stub-annotations",
"aconfig-annotations-lib",
- "aconfig_storage_reader_java",
+ "aconfig_storage_stub",
"unsupportedappusage",
}