diff options
| author | 2024-04-09 06:12:34 +0000 | |
|---|---|---|
| committer | 2024-04-09 06:12:34 +0000 | |
| commit | 61238bea97b705d06c95d6c3353acc73f230b98e (patch) | |
| tree | 01480a723b28cc4e9d94d70bfa99f1925acefc02 | |
| parent | e15d816137fdc05c8c36b14adfa13d2a6a09b2b5 (diff) | |
| parent | 3bd01f6482036ff0a6779e60d7a36c83ff81ed33 (diff) | |
Merge "Remove VNDK definition(s)" into main am: 3bd01f6482
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2997438
Change-Id: I6fda03ee6c4ed3283991ec87813111fa7366c03e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cmds/dumpstate/Android.bp | 3 | ||||
| -rw-r--r-- | libs/binder/Android.bp | 3 | ||||
| -rw-r--r-- | libs/bufferqueueconverter/Android.bp | 3 | ||||
| -rw-r--r-- | libs/gralloc/types/Android.bp | 5 | ||||
| -rw-r--r-- | libs/gui/Android.bp | 4 | ||||
| -rw-r--r-- | libs/ui/Android.bp | 3 |
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 3edbb808ba..9c24dc590c 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -358,9 +358,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: [ |