diff options
author | Ted Bauer <tedbauer@google.com> | 2024-04-24 00:43:43 +0000 |
---|---|---|
committer | Ted Bauer <tedbauer@google.com> | 2024-04-29 21:21:43 +0000 |
commit | b79ebce33658d2fc047352501c826a0538c6201e (patch) | |
tree | 650a067b2c41a58c8137c59794e3dfd228a8f309 | |
parent | 7d720a0e04c92d0bc9bbc854e7fc60eb0c742ffe (diff) | |
download | av-b79ebce33658d2fc047352501c826a0538c6201e.tar.gz |
Add deps for new aconfig flagging storage
Aconfig flagging storage is migrating to a new underlying storage, which
has new dependencies. Add the dependencies as a defaults.
Bug: 328444881
Test: m
Change-Id: Id73ea17b5361e3445db9025bc490ea7c4e872529
-rw-r--r-- | media/codec2/hal/aidl/Android.bp | 2 | ||||
-rw-r--r-- | media/codec2/hal/common/Android.bp | 4 | ||||
-rw-r--r-- | media/codec2/sfplugin/Android.bp | 4 | ||||
-rw-r--r-- | media/codec2/vndk/Android.bp | 1 | ||||
-rw-r--r-- | media/libstagefright/Android.bp | 4 | ||||
-rw-r--r-- | services/audiopolicy/engine/common/Android.bp | 3 | ||||
-rw-r--r-- | services/audiopolicy/engineconfigurable/Android.bp | 3 | ||||
-rw-r--r-- | services/audiopolicy/enginedefault/Android.bp | 3 | ||||
-rw-r--r-- | services/mediaresourcemanager/test/Android.bp | 3 |
9 files changed, 27 insertions, 0 deletions
diff --git a/media/codec2/hal/aidl/Android.bp b/media/codec2/hal/aidl/Android.bp index 48b6e21535..e16e2b1726 100644 --- a/media/codec2/hal/aidl/Android.bp +++ b/media/codec2/hal/aidl/Android.bp @@ -8,6 +8,7 @@ cc_library { name: "libcodec2_aidl_client", defaults: [ + "aconfig_lib_cc_static_link.defaults", "libcodec2_hal_selection", ], @@ -65,6 +66,7 @@ cc_library { ], defaults: [ + "aconfig_lib_cc_static_link.defaults", "libcodec2_hal_selection", ], diff --git a/media/codec2/hal/common/Android.bp b/media/codec2/hal/common/Android.bp index 7d7b28545a..4c9da33c3c 100644 --- a/media/codec2/hal/common/Android.bp +++ b/media/codec2/hal/common/Android.bp @@ -31,6 +31,10 @@ cc_library { ], static_libs: ["aconfig_mediacodec_flags_c_lib"], + + defaults: [ + "aconfig_lib_cc_static_link.defaults", + ], } cc_library_static { diff --git a/media/codec2/sfplugin/Android.bp b/media/codec2/sfplugin/Android.bp index 362373e3cf..7076bacda9 100644 --- a/media/codec2/sfplugin/Android.bp +++ b/media/codec2/sfplugin/Android.bp @@ -91,6 +91,10 @@ cc_library_shared { "libcodec2_client", ], + defaults: [ + "aconfig_lib_cc_static_link.defaults", + ], + sanitize: { cfi: true, misc_undefined: [ diff --git a/media/codec2/vndk/Android.bp b/media/codec2/vndk/Android.bp index 9f57bfd1c2..dc06ee6400 100644 --- a/media/codec2/vndk/Android.bp +++ b/media/codec2/vndk/Android.bp @@ -53,6 +53,7 @@ cc_library { ], defaults: [ + "aconfig_lib_cc_static_link.defaults", "libcodec2_hal_selection", ], diff --git a/media/libstagefright/Android.bp b/media/libstagefright/Android.bp index 886285e7c2..c9a2eea93d 100644 --- a/media/libstagefright/Android.bp +++ b/media/libstagefright/Android.bp @@ -318,6 +318,10 @@ cc_library { "aconfig_mediacodec_flags_c_lib", ], + defaults: [ + "aconfig_lib_cc_static_link.defaults", + ], + static_libs: [ "android.media.codec-aconfig-cc", "libstagefright_esds", diff --git a/services/audiopolicy/engine/common/Android.bp b/services/audiopolicy/engine/common/Android.bp index d7eb2c8170..878e0e9021 100644 --- a/services/audiopolicy/engine/common/Android.bp +++ b/services/audiopolicy/engine/common/Android.bp @@ -61,4 +61,7 @@ cc_library_static { "com.android.media.audio-aconfig-cc", "server_configurable_flags", ], + defaults: [ + "aconfig_lib_cc_static_link.defaults", + ], } diff --git a/services/audiopolicy/engineconfigurable/Android.bp b/services/audiopolicy/engineconfigurable/Android.bp index aaf89a0380..2c3c4bee30 100644 --- a/services/audiopolicy/engineconfigurable/Android.bp +++ b/services/audiopolicy/engineconfigurable/Android.bp @@ -53,4 +53,7 @@ cc_library_shared { "libutils", "libxml2", ], + defaults: [ + "aconfig_lib_cc_static_link.defaults", + ], } diff --git a/services/audiopolicy/enginedefault/Android.bp b/services/audiopolicy/enginedefault/Android.bp index 1563d5f257..f5958bae02 100644 --- a/services/audiopolicy/enginedefault/Android.bp +++ b/services/audiopolicy/enginedefault/Android.bp @@ -40,4 +40,7 @@ cc_library_shared { "libutils", "libxml2", ], + defaults: [ + "aconfig_lib_cc_static_link.defaults", + ], } diff --git a/services/mediaresourcemanager/test/Android.bp b/services/mediaresourcemanager/test/Android.bp index 6a64823052..5dfec3050d 100644 --- a/services/mediaresourcemanager/test/Android.bp +++ b/services/mediaresourcemanager/test/Android.bp @@ -29,6 +29,9 @@ cc_test { "libactivitymanager_aidl", "server_configurable_flags", ], + defaults: [ + "aconfig_lib_cc_static_link.defaults", + ], include_dirs: [ "frameworks/av/include", "frameworks/av/services/mediaresourcemanager", |