From a013e3d53d82253dfbd0ebdb25ac778b3a47b24b Mon Sep 17 00:00:00 2001 From: Dongwon Kang Date: Fri, 15 Mar 2019 14:43:07 -0700 Subject: [PATCH] List stable libraries media apex relies on. With allow_all_shared_libs, the libs under /system/lib may be used instead of libs included in the apex. This change adds stable libraries the media apex relies on to prevent this case. Test: dumpsys media.extractor, atest MediaPlayer2Test Bug: 127791685 Change-Id: I6a0419e6da9e9f48a394257b1e8f977ec2dfa9a1 --- rootdir/etc/ld.config.legacy.txt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/rootdir/etc/ld.config.legacy.txt b/rootdir/etc/ld.config.legacy.txt index d4d5c28d6..d282cfa70 100644 --- a/rootdir/etc/ld.config.legacy.txt +++ b/rootdir/etc/ld.config.legacy.txt @@ -94,7 +94,21 @@ namespace.media.asan.search.paths = /apex/com.android.media/${LIB} namespace.media.permitted.paths = /apex/com.android.media/${LIB}/extractors namespace.media.links = default -namespace.media.link.default.allow_all_shared_libs = true +namespace.media.link.default.shared_libs = libandroid.so +namespace.media.link.default.shared_libs += libbinder_ndk.so +namespace.media.link.default.shared_libs += libc.so +namespace.media.link.default.shared_libs += libdl.so +namespace.media.link.default.shared_libs += liblog.so +namespace.media.link.default.shared_libs += libmediametrics.so +namespace.media.link.default.shared_libs += libmediandk.so +namespace.media.link.default.shared_libs += libm.so +namespace.media.link.default.shared_libs += libvndksupport.so + +namespace.media.link.default.shared_libs += libclang_rt.asan-aarch64-android.so +namespace.media.link.default.shared_libs += libclang_rt.asan-arm-android.so +namespace.media.link.default.shared_libs += libclang_rt.asan-i686-android.so +namespace.media.link.default.shared_libs += libclang_rt.asan-x86_64-android.so +namespace.media.link.default.shared_libs += libclang_rt.hwasan-aarch64-android.so ############################################################################### # "conscrypt" APEX namespace