From 97772e425b44d5967a6e2716b1e9215fcc157f88 Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Tue, 12 Dec 2017 15:57:53 +0800 Subject: [PATCH] android.hardware.graphics.allocator@2.0 is no longer VNDK-SP The interface lib has been in VNDK-SP because android.hardware.graphics.mapper@1.0 was using it. However, since the dependency has gone [1], there is no need keep it in VNDK-SP. The VNDK-SP set should be kept as small as possible because libs in VNDK-SP are subject to double-loading. [1] https://android.googlesource.com/platform/hardware/interfaces/+/79d13ff0f5cd3c4242445baf5b2f01a52f0ed06f Bug: 69480083 Test: /system/lib64/vndk-sp/android.hardware.graphics.allocator@2.0.so disappears. Test: sailfish boots Change-Id: I0e6518f169dd620d6b1a9ada47754e371ef4a739 Merged-In: I0e6518f169dd620d6b1a9ada47754e371ef4a739 (cherry picked from commit 9d898f3678f8ecc7fb35107c36f73c1fc9235848) --- rootdir/etc/ld.config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 3183b80e7..2cba1e374 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -76,7 +76,7 @@ namespace.sphal.links = default,vndk,rs namespace.sphal.link.default.shared_libs = libc.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libEGL.so:libsync.so:libGLESv1_CM.so:libGLESv2.so:libvndksupport.so:libz.so # WARNING: only VNDK-SP libs can be listed here. DO NOT EDIT this line. -namespace.sphal.link.vndk.shared_libs = android.hardware.renderscript@1.0.so:android.hardware.graphics.allocator@2.0.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.common@1.0.so:android.hidl.memory@1.0.so:libhwbinder.so:libbase.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libhidltransport.so:libion.so:libutils.so:libc++.so +namespace.sphal.link.vndk.shared_libs = android.hardware.renderscript@1.0.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.common@1.0.so:android.hidl.memory@1.0.so:libhwbinder.so:libbase.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libhidltransport.so:libion.so:libutils.so:libc++.so # Renderscript gets separate namespace namespace.sphal.link.rs.shared_libs = libRS_internal.so @@ -99,7 +99,7 @@ namespace.rs.asan.permitted.paths = /data/asan/vendor/${LIB}:/vendor/${LIB}:/dat namespace.rs.links = default,vndk namespace.rs.link.default.shared_libs = libc.so:libm.so:libdl.so:libstdc++.so:liblog.so:libnativewindow.so:libEGL.so:libsync.so:libGLESv1_CM.so:libGLESv2.so:libmediandk.so:libvndksupport.so:libz.so:libft2.so -namespace.rs.link.vndk.shared_libs = android.hardware.renderscript@1.0.so:android.hardware.graphics.allocator@2.0.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.common@1.0.so:android.hidl.memory@1.0.so:libhwbinder.so:libbase.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libhidltransport.so:libion.so:libutils.so:libc++.so +namespace.rs.link.vndk.shared_libs = android.hardware.renderscript@1.0.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.common@1.0.so:android.hidl.memory@1.0.so:libhwbinder.so:libbase.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libhidltransport.so:libion.so:libutils.so:libc++.so ############################################################################### # "vndk" namespace