libselinux is LLNDK, not VNDK-coreandroid-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-dev

libselinux has stable C APIs and therefore provides a stub library for
Mainline clients. It is not copied into any Mainline modules and the
only instance of the lib in /system/lib serves all of them.

However for vendors, we still had another copy of libselinux in VNDK
(e.g. in the VNDK APEX that is served via the path /system/lib/vndk).
Since the library is guaranteed to have stable C APIs, there is no
reason to keep the vendor variant of the library in VNDK. Keeping it in
VNDK would be just a waste of storage space.

This change removes libselinux from VNDK and marks it as LLNDK. The
single instance of if in /system/lib serves vendor processes as well as
Mainline modules.

Exempt-From-Owner-Approval: cherry-pick from AOSP

Bug: 151303316
Test: m
Merged-In: Ibb3e125c1bf4ef7873ae8df0795e781f64d743f1
(cherry picked from commit 1ea855ee67517de609aa1e78851f623fc696e143)
Change-Id: Ibb3e125c1bf4ef7873ae8df0795e781f64d743f1

1 files changed, 6 insertions, 5 deletions

diff --git a/libselinux/Android.bp b/libselinux/Android.bp
index 90dfe183..664e9288 100644
--- a/libselinux/Android.bp
+++ b/libselinux/Android.bp
@@ -100,11 +100,6 @@ cc_library {
     name: "libselinux",
     defaults: ["libselinux_defaults"],
 
-    vendor_available: true,
-    vndk: {
-        enabled: true,
-    },
-    double_loadable: true,
     recovery_available: true,
 
     host_supported: true,
@@ -214,6 +209,12 @@ cc_library {
     },
 }
 
+llndk_library {
+    name: "libselinux",
+    export_include_dirs: ["include"],
+    symbol_file: "exported.map",
+}
+
 cc_binary_host {
     name: "sefcontext_compile",
     defaults: ["libselinux_defaults"],