Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f34a08f8 authored by Dongwon Kang's avatar Dongwon Kang Committed by android-build-merger
Browse files

Merge "Remove libandroid.so from media namespace." into qt-dev 

am: 2b107b8b

Change-Id: I5b83476196221d71db4137b4cbc2a3f5f786c3b3
parents 529c7eb5 2b107b8b

rootdir/etc/ld.config.legacy.txt

+0 −1
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ 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.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 += libcgrouprc.so

rootdir/etc/ld.config.txt

+0 −2
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ namespace.media.permitted.paths = /apex/com.android.media/${LIB}/extractors 


namespace.media.links = default

namespace.media.link.default.shared_libs  = %LLNDK_LIBRARIES%

namespace.media.link.default.shared_libs += libandroid.so

namespace.media.link.default.shared_libs += libbinder_ndk.so

namespace.media.link.default.shared_libs += libmediametrics.so

namespace.media.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
@@ -622,7 +621,6 @@ namespace.media.permitted.paths = /apex/com.android.media/${LIB}/extractors 


namespace.media.links = default

namespace.media.link.default.shared_libs  = %LLNDK_LIBRARIES%

namespace.media.link.default.shared_libs += libandroid.so

namespace.media.link.default.shared_libs += libbinder_ndk.so

namespace.media.link.default.shared_libs += libmediametrics.so

namespace.media.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%

rootdir/etc/ld.config.vndk_lite.txt

+0 −2
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ namespace.media.permitted.paths = /apex/com.android.media/${LIB}/extractors 


namespace.media.links = default

namespace.media.link.default.shared_libs  = %LLNDK_LIBRARIES%

namespace.media.link.default.shared_libs += libandroid.so

namespace.media.link.default.shared_libs += libbinder_ndk.so

namespace.media.link.default.shared_libs += libmediametrics.so

namespace.media.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
@@ -445,7 +444,6 @@ namespace.media.permitted.paths = /apex/com.android.media/${LIB}/extractors 


namespace.media.links = default

namespace.media.link.default.shared_libs  = %LLNDK_LIBRARIES%

namespace.media.link.default.shared_libs += libandroid.so

namespace.media.link.default.shared_libs += libbinder_ndk.so

namespace.media.link.default.shared_libs += libmediametrics.so

namespace.media.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%