From fb2a4f08745d1673133ad524237c71878165f2c2 Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Thu, 22 Jun 2017 19:36:14 +0800 Subject: [PATCH] ld-config: Export android.hidl.memory@1.0-impl This commit exports android.hidl.memory@1.0-impl.so from default linker namespace to vndk (VNDK-SP) linker namespace. This fixes libhidlmemory.so failure. Note: Exposing android.hidl.memory@1.0-impl.so from default linker namespace to vndk (VNDK-SP) linker namespace shall be fine because its APIs are frozen and won't be changed in the future. Note: android.hidl.memory@1.0-impl.so is NOT exported to sphal linker namespace. Bug: 35107583 Bug: 62778280 Test: Write a test SP-HAL lib which links libhidlmemory.so, load that SP-HAL lib into system executable, and make sure mapMemory() works. Test: sailfish boots w/o problems. Merged-In: Ia36350dcf1f8c8dc6d7bf2c7a6ae65e0ebaef578 Merged-In: Iddb723558c3a814a905cd42797594a707bc651da Change-Id: I69034595b2cd355e786ce7943fed7dddf1b12525 (cherry picked from commit bd7503dae7008bfecbd729ba9e473c73ada17141) (cherry picked from commit 3251e582f268b2b30a35e482e026fc9026b3956c) --- rootdir/etc/ld.config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 52f7ed0a8..e2c70f386 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -103,7 +103,7 @@ namespace.vndk.asan.permitted.paths = /data/asan/vendor/${LIB}/hw:/vendor/${LIB} # to the default namespace. This is possible since their ABI is stable across # Android releases. namespace.vndk.links = default -namespace.vndk.link.default.shared_libs = libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libEGL.so:libsync.so:libvndksupport.so +namespace.vndk.link.default.shared_libs = android.hidl.memory@1.0-impl.so:libc.so:libz.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libEGL.so:libsync.so:libvndksupport.so [vendor]