From 8ce4a3067c1f0bdb10262b93f0283b84c5ebe816 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 11 Mar 2020 14:00:33 +0900 Subject: [PATCH] Make libselinux a stub library libselinux is currently being copied to APEXes. This is risky because the library is not designed to be portable; part of it is tied to the specific version of the Android that it was developed for. This change fixes the problem by declaring that the library supports a stub with the list of C APIs that are included in the stub. Then there is only one copy of libselinux in /system/lib and other APEXes use the copy by dynamically linking to it. Also, adbd no longer statically links to it, because doing so brings libselinux in it. Bug: 151053366 Test: m com.android.adbd. It doesn't include libselinux in it. Test: m com.android.adbd-deps-info. then inspect out/soong/com.android.adbd-deps-info.txt. The dependency to libselinux is shown as '(external)'. Exempt-From-Owner-Approval: cherry-pick from AOSP Merged-In: If418cbe3abdeacb759d59052e6dca4c2067678dd (cherry picked from commit 3ffdad0cb5bbc3855af7705fee62e2be09583a17) Change-Id: If418cbe3abdeacb759d59052e6dca4c2067678dd --- adb/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adb/Android.bp b/adb/Android.bp index 137168609..c2ca2cb76 100644 --- a/adb/Android.bp +++ b/adb/Android.bp @@ -577,7 +577,6 @@ cc_binary { "libdiagnose_usb", "libmdnssd", "libminijail", - "libselinux", "libssl", ], @@ -588,6 +587,7 @@ cc_binary { "libadbd_fs", "libcrypto", "liblog", + "libselinux", ], target: {