summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Zhi Dou <zhidou@google.com> 2024-11-22 03:39:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-11-22 03:39:20 +0000
commitdeb25ad3479f28a0866d306a40b4b1f01ebaa436 (patch)
tree4465ea46a6b65a3785af433def96789977f25e76
parent9d896e441723ca175f05802b2dc2f914d5e4cef8 (diff)
parent4706f84d3ec9058925c0a999db9e16a0414f4075 (diff)
Merge "replace aconfig_storage_reader_java to aconfig_storage_stub" into main am: 4706f84d3e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/3366603 Change-Id: I981c1a5c3666fce1c3d706b29b006a40ab4d9392 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--flags/Android.bp2
-rw-r--r--framework/Android.bp2
2 files changed, 2 insertions, 2 deletions
diff --git a/flags/Android.bp b/flags/Android.bp
index 3170e05903..5deabc5f54 100644
--- a/flags/Android.bp
+++ b/flags/Android.bp
@@ -51,6 +51,6 @@ java_defaults {
sdk_version: "core_platform",
libs: [
"fake_device_config",
- "aconfig_storage_reader_java",
+ "aconfig_storage_stub",
],
}
diff --git a/framework/Android.bp b/framework/Android.bp
index b9d394776c..f1186f4854 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -117,7 +117,7 @@ java_defaults {
// Add aconfig-annotations-lib as a dependency for the optimization
"aconfig-annotations-lib",
// library for generated flag code read new storage
- "aconfig_storage_reader_java",
+ "aconfig_storage_stub",
"framework-configinfrastructure.stubs.module_lib",
],
aidl: {