Remove VNDK definition(s)

As of VNDK deprecation, any libraries that defines vndk is no longer valid anymore. This change removes all VNDK definition(s) from modules which was VNDK. Any former VNDK-SP libraries will be marked as double-loadable, so it can keep be able to be referenced by LLNDK libraries. Bug: 328994089 Test: AOSP CF build succeeded Change-Id: I1662f16e5e446bb28167b0bb278cd63997267d2a
LineageOS · Mar 15, 2024 · ad8cf52 · ad8cf52
1 parent b2bfb97
commit ad8cf52
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 28 deletions.
diff --git a/libcrypto_utils/Android.bp b/libcrypto_utils/Android.bp
@@ -24,9 +24,6 @@ cc_library {
     ramdisk_available: true,
     vendor_ramdisk_available: true,
     recovery_available: true,
-    vndk: {
-        enabled: true,
-    },
     host_supported: true,
     srcs: [
         "android_pubkey.cpp",

diff --git a/libcutils/Android.bp b/libcutils/Android.bp
@@ -129,10 +129,7 @@ libcutils_nonwindows_sources = [
 cc_library {
     name: "libcutils",
     defaults: ["libcutils_defaults"],
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
+    double_loadable: true,
     srcs: [
         "config_utils.cpp",
         "iosched_policy.cpp",

diff --git a/libnetutils/Android.bp b/libnetutils/Android.bp
@@ -18,9 +18,6 @@ license {
 cc_library_shared {
     name: "libnetutils",
     vendor_available: true,
-    vndk: {
-        enabled: true,
-    },
 
     srcs: [
         "dhcpclient.c",

diff --git a/libprocessgroup/Android.bp b/libprocessgroup/Android.bp
@@ -53,10 +53,7 @@ cc_library {
     recovery_available: true,
     vendor_available: true,
     product_available: true,
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
+    double_loadable: true,
     shared_libs: [
         "libbase",
         "libcgrouprc",

diff --git a/libsysutils/Android.bp b/libsysutils/Android.bp
@@ -5,9 +5,6 @@ package {
 cc_library {
     name: "libsysutils",
     vendor_available: true,
-    vndk: {
-        enabled: true,
-    },
 
     srcs: [
         "src/SocketListener.cpp",

diff --git a/libusbhost/Android.bp b/libusbhost/Android.bp
@@ -21,9 +21,6 @@ package {
 cc_library {
     name: "libusbhost",
     vendor_available: true,
-    vndk: {
-        enabled: true,
-    },
     host_supported: true,
     srcs: ["usbhost.c"],
     cflags: ["-Werror"],

diff --git a/libutils/Android.bp b/libutils/Android.bp
@@ -183,10 +183,7 @@ cc_library {
     name: "libutils",
     defaults: ["libutils_impl_defaults"],
 
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
+    double_loadable: true,
 
     target: {
         product: {
@@ -228,10 +225,7 @@ cc_library {
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
     min_sdk_version: "29",
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
+    double_loadable: true,
 
     header_libs: [
         "libbase_headers",