diff --git a/libcrypto_utils/Android.bp b/libcrypto_utils/Android.bp index 2559137d9..b2af06c97 100644 --- 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 index b7752d902..e2975813c 100644 --- 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 index 02bd2e3dc..0bca66209 100644 --- 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 index bb855d58c..d40be9f9e 100644 --- a/libprocessgroup/Android.bp +++ b/libprocessgroup/Android.bp @@ -72,10 +72,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 index 1b41a6b17..842db4033 100644 --- 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 index 9ae73d0d8..f8a73ad18 100644 --- 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 index 17411871c..ba19ace00 100644 --- 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",