summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kiyoung Kim <kiyoungkim@google.com> 2024-03-11 13:04:37 +0900
committer Kiyoung Kim <kiyoungkim@google.com> 2024-03-15 08:27:27 +0000
commit1bdf40df0e5a434ee99c29eefdc672f01fb4cfe3 (patch)
tree209e3cac882c1d8e31453a450a070cf6fecf3b58
parent790bbb927638b103434c5cc456b0bd345607905b (diff)
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: Ic53d89878bb35ca85640daf938ae34a0fb22e7af
-rw-r--r--cmds/dumpstate/Android.bp3
-rw-r--r--libs/binder/Android.bp3
-rw-r--r--libs/bufferqueueconverter/Android.bp3
-rw-r--r--libs/gralloc/types/Android.bp5
-rw-r--r--libs/gui/Android.bp4
-rw-r--r--libs/ui/Android.bp3
6 files changed, 1 insertions, 20 deletions
diff --git a/cmds/dumpstate/Android.bp b/cmds/dumpstate/Android.bp
index 23f185e305..23f33d85a2 100644
--- a/cmds/dumpstate/Android.bp
+++ b/cmds/dumpstate/Android.bp
@@ -37,9 +37,6 @@ cc_library_shared {
name: "libdumpstateutil",
defaults: ["dumpstate_cflag_defaults"],
vendor_available: true,
- vndk: {
- enabled: true,
- },
srcs: [
"DumpstateInternal.cpp",
"DumpstateUtil.cpp",
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 84ff9d74ef..4a79f9e60a 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -356,9 +356,6 @@ cc_library {
// for vndbinder
vendor_available: true,
- vndk: {
- enabled: true,
- },
recovery_available: true,
double_loadable: true,
// TODO(b/153609531): remove when no longer needed.
diff --git a/libs/bufferqueueconverter/Android.bp b/libs/bufferqueueconverter/Android.bp
index 3fe71cefce..2c25f746a8 100644
--- a/libs/bufferqueueconverter/Android.bp
+++ b/libs/bufferqueueconverter/Android.bp
@@ -16,9 +16,6 @@ cc_library_headers {
cc_library {
name: "libbufferqueueconverter",
vendor_available: true,
- vndk: {
- enabled: true,
- },
double_loadable: true,
srcs: [
diff --git a/libs/gralloc/types/Android.bp b/libs/gralloc/types/Android.bp
index aab1276b47..6e2b803174 100644
--- a/libs/gralloc/types/Android.bp
+++ b/libs/gralloc/types/Android.bp
@@ -37,10 +37,7 @@ cc_library {
},
vendor_available: true,
- vndk: {
- enabled: true,
- support_system_process: true,
- },
+ double_loadable: true,
apex_available: [
"//apex_available:platform",
"com.android.media.swcodec",
diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp
index eb4d3df21d..86431484d6 100644
--- a/libs/gui/Android.bp
+++ b/libs/gui/Android.bp
@@ -281,10 +281,6 @@ cc_defaults {
cc_library_shared {
name: "libgui",
vendor_available: true,
- vndk: {
- enabled: true,
- private: true,
- },
double_loadable: true,
defaults: [
diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp
index ec0ab4e464..f84d14548f 100644
--- a/libs/ui/Android.bp
+++ b/libs/ui/Android.bp
@@ -104,9 +104,6 @@ cc_library_static {
cc_library_shared {
name: "libui",
vendor_available: true,
- vndk: {
- enabled: true,
- },
double_loadable: true,
cflags: [