summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Zhi Dou <zhidou@google.com> 2024-07-26 15:57:05 +0000
committer Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 2024-07-26 15:57:05 +0000
commit48e2f0c0e6e145b7dd5eaaa8243561af4f6a7d88 (patch)
tree9c95fe904defc1588a210ecb636f51242a02ffc1
parent1ae0f2684905547a9f55b89fc1bb3fd052f117ab (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 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0a8e873944cf2eb1ec97da17994c8a707ddbf895) Merged-In: Idd90fa1beb9a5859132a99112f0340d663bf9476 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 6e0319b01a..7d0ae97569 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -116,6 +116,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: {