summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-06-24 18:37:41 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-06-24 18:37:41 +0000
commite707fa9c1f87eebd7f43e29b39bf3c99e06c54e2 (patch)
tree127b041789e20658f784f699980b379c1d3090a3
parent5160f02b8eb07350f236d4f3536f141c369d2f29 (diff)
parentc4aaa2961952d49c3d23b78c6ac8895bb8826b9f (diff)
Merge "Add new aconfig dependencies" into main am: c4aaa29619
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3137233 Change-Id: Ic1035114e99cb07a1ef9c906a31fe7df6ab0c8a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/jni/Android.bp2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index 61eaa526116c..e21d1dfac865 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -127,6 +127,7 @@ cc_library_shared_for_libandroid_runtime {
],
defaults: [
+ "aconfig_lib_cc_shared_link.defaults",
"latest_android_media_audio_common_types_cpp_target_shared",
],
@@ -365,6 +366,7 @@ cc_library_shared_for_libandroid_runtime {
"libdl_android",
"libtimeinstate",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
"libimage_io",
"libultrahdr",
"libperfetto_c",