summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Zhi Dou <zhidou@google.com> 2024-07-25 21:52:04 +0000
committer Zhi Dou <zhidou@google.com> 2024-07-26 15:41:28 +0000
commit0a8e873944cf2eb1ec97da17994c8a707ddbf895 (patch)
treea1146bb2632840260e66bc58ab1b3dfef95e180b
parent0b6ed659d3a07da403ab3b81460f23d006539125 (diff)
add "aconfig_storage_reader_java" for generated flag lib
This change adds "aconfig_storage_reader_java" for generated flag library to read flag value from new storage. Wifi module uses some aconfig flag for guarding the code. We are working switching the storage backend of the flag from DeviceConfig to a new storage system. The flag library will get the flag value though this reader library. Wifi module added the flag library as source file, so we need to explicitly add the library here as a dynamic dependency for building purpose. Test: presubmit Bug: 349874828 Flag: n/a Change-Id: Idd90fa1beb9a5859132a99112f0340d663bf9476
-rw-r--r--flags/Android.bp5
-rw-r--r--framework/Android.bp2
2 files changed, 6 insertions, 1 deletions
diff --git a/flags/Android.bp b/flags/Android.bp
index f73608a5d8..3170e05903 100644
--- a/flags/Android.bp
+++ b/flags/Android.bp
@@ -49,5 +49,8 @@ java_aconfig_library {
java_defaults {
name: "wifi-framework-aconfig-java-defaults",
sdk_version: "core_platform",
- libs: ["fake_device_config"],
+ libs: [
+ "fake_device_config",
+ "aconfig_storage_reader_java",
+ ],
}
diff --git a/framework/Android.bp b/framework/Android.bp
index 44682a43d7..70116c4e5c 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -115,6 +115,8 @@ java_defaults {
"app-compat-annotations",
// 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",
"framework-configinfrastructure",
],
aidl: {