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

Commit 10f81beb authored by Daichi Hirono's avatar Daichi Hirono
Browse files

Allow sphal to load some LLNDK for legacy devices. 

For devices disabling treble, some VNDK-SP libraries needs to be loaded
as LLNDK. The CL modifies ld.config.txt to allow to load them from sphal.

Bug: 140781725
Test: Boot and check logcat. No native crash from mediaswcodec
Change-Id: Iec24405ec78359d78f4e7f43d9d046f3c70ff129
parent ea51ad6e

apex/ld.config.txt

+3 −2
Original line number Diff line number Diff line
@@ -129,5 +129,6 @@ namespace.sphal.links = platform 
# namespace.sphal.link.platform.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%

namespace.sphal.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.asan-i686-android.so:libclang_rt.asan-x86_64-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so



# Add a link for libz.so which is llndk on devices where VNDK is not enforced.

namespace.sphal.link.platform.shared_libs += libz.so
 
# Allow to load VNDK-SP from /system/lib. Devices where VNDK is not enforced, do

# not have vndk-sp directories.

namespace.sphal.link.platform.shared_libs += libz.so:android.hardware.graphics.mapper@2.0.so:libbase.so:libcutils.so:libhardware.so:libhidlbase.so:libutils.so:libc++.so
 
 No newline at end of file