switch over to use new storage read api instead of
server_configurable_flags, this new read api lib will be needed for new
codegened aconfig flag lib.
Bug: 321077378
Test m and avd
Change-Id: I182b01460230b7abfd430ad242a188fbf4a4970b
diff --git a/media/codec2/hal/common/Android.bp b/media/codec2/hal/common/Android.bp
index 4c9da33..0638363 100644
--- a/media/codec2/hal/common/Android.bp
+++ b/media/codec2/hal/common/Android.bp
@@ -28,13 +28,9 @@
"liblog",
"libstagefright_foundation",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
-
static_libs: ["aconfig_mediacodec_flags_c_lib"],
-
- defaults: [
- "aconfig_lib_cc_static_link.defaults",
- ],
}
cc_library_static {
@@ -57,6 +53,7 @@
shared_libs: [
"libbase",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
static_libs: ["aconfig_mediacodec_flags_c_lib"],
@@ -71,5 +68,6 @@
shared_libs: [
"libbase",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
}
diff --git a/media/codec2/sfplugin/Android.bp b/media/codec2/sfplugin/Android.bp
index 7076bac..3c8c1b7 100644
--- a/media/codec2/sfplugin/Android.bp
+++ b/media/codec2/sfplugin/Android.bp
@@ -84,6 +84,7 @@
"libui",
"libutils",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
export_shared_lib_headers: [
@@ -91,10 +92,6 @@
"libcodec2_client",
],
- defaults: [
- "aconfig_lib_cc_static_link.defaults",
- ],
-
sanitize: {
cfi: true,
misc_undefined: [
diff --git a/media/libstagefright/Android.bp b/media/libstagefright/Android.bp
index 5b6848c..ac178aa 100644
--- a/media/libstagefright/Android.bp
+++ b/media/libstagefright/Android.bp
@@ -315,13 +315,10 @@
"libaudioclient_aidl_conversion",
"packagemanager_aidl-cpp",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
"aconfig_mediacodec_flags_c_lib",
],
- defaults: [
- "aconfig_lib_cc_static_link.defaults",
- ],
-
static_libs: [
"android.media.codec-aconfig-cc",
"libstagefright_esds",