commit d9227e90e7f56e04184a8a1690ce7a1a9ceadcee
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jun 24 18:56:56 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 24 18:56:56 2024 +0000
tree 7b019d6a9118194131e2fc2999d37388aa08cda6
parent 7be09b683280e1e713a8e67675e474868f2628a4
parent e707fa9c1f87eebd7f43e29b39bf3c99e06c54e2

Merge "Add new aconfig dependencies" into main am: c4aaa29619 am: e707fa9c1f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3137233

Change-Id: I953d6bb4c5f0ce6d392b06e156e328510d135731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/jni/Android.bp

diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index 61eaa52..e21d1df 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -127,6 +127,7 @@
     ],
 
     defaults: [
+        "aconfig_lib_cc_shared_link.defaults",
         "latest_android_media_audio_common_types_cpp_target_shared",
     ],
 
@@ -365,6 +366,7 @@
                 "libdl_android",
                 "libtimeinstate",
                 "server_configurable_flags",
+                "libaconfig_storage_read_api_cc",
                 "libimage_io",
                 "libultrahdr",
                 "libperfetto_c",