From 09639b93bab15552c94adebacd202974e1b284f2 Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Tue, 12 Mar 2024 16:53:54 +0900 Subject: [PATCH] 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: Ic4f19113c1a25dc1fb60cdfbf9c0f2d8d7d09726 Ignore-AOSP-First: Merge conflict --- audio/common/2.0/Android.bp | 3 --- automotive/evs/aidl/Android.bp | 3 --- common/aidl/Android.bp | 5 +---- common/fmq/aidl/Android.bp | 5 +---- configstore/1.0/Android.bp | 3 --- configstore/1.1/Android.bp | 3 --- configstore/utils/Android.bp | 9 +++------ confirmationui/support/Android.bp | 3 --- graphics/allocator/2.0/Android.bp | 3 --- graphics/allocator/3.0/Android.bp | 3 --- graphics/allocator/4.0/Android.bp | 3 --- graphics/allocator/aidl/Android.bp | 8 +------- graphics/bufferqueue/1.0/Android.bp | 3 --- graphics/bufferqueue/2.0/Android.bp | 3 --- graphics/common/1.0/Android.bp | 4 ---- graphics/common/1.1/Android.bp | 4 ---- graphics/common/1.2/Android.bp | 4 ---- graphics/common/aidl/Android.bp | 5 +---- graphics/composer/aidl/Android.bp | 8 +------- graphics/mapper/2.0/Android.bp | 4 ---- graphics/mapper/2.1/Android.bp | 4 ---- graphics/mapper/3.0/Android.bp | 4 ---- graphics/mapper/4.0/Android.bp | 4 ---- media/1.0/Android.bp | 3 --- media/bufferpool/2.0/Android.bp | 3 --- media/omx/1.0/Android.bp | 3 --- memtrack/1.0/Android.bp | 3 --- memtrack/aidl/Android.bp | 3 --- renderscript/1.0/Android.bp | 4 ---- soundtrigger/2.0/Android.bp | 3 --- soundtrigger/2.0/default/Android.bp | 3 --- 31 files changed, 8 insertions(+), 115 deletions(-) diff --git a/audio/common/2.0/Android.bp b/audio/common/2.0/Android.bp index 450e04f38d..679d6b0cc4 100644 --- a/audio/common/2.0/Android.bp +++ b/audio/common/2.0/Android.bp @@ -15,9 +15,6 @@ hidl_interface { root: "android.hardware", // TODO(b/153609531): remove when no longer needed. native_bridge_supported: true, - vndk: { - enabled: true, - }, srcs: [ "types.hal", ], diff --git a/automotive/evs/aidl/Android.bp b/automotive/evs/aidl/Android.bp index 3bfe8f3069..dfb15c6448 100644 --- a/automotive/evs/aidl/Android.bp +++ b/automotive/evs/aidl/Android.bp @@ -42,9 +42,6 @@ aidl_interface { enabled: false, }, ndk: { - vndk: { - enabled: false, - }, min_sdk_version: "29", }, }, diff --git a/common/aidl/Android.bp b/common/aidl/Android.bp index 1457b8a478..11de087557 100644 --- a/common/aidl/Android.bp +++ b/common/aidl/Android.bp @@ -11,10 +11,7 @@ aidl_interface { name: "android.hardware.common", host_supported: true, vendor_available: true, - vndk: { - enabled: true, - support_system_process: true, - }, + double_loadable: true, vndk_use_version: "2", srcs: [ "android/hardware/common/*.aidl", diff --git a/common/fmq/aidl/Android.bp b/common/fmq/aidl/Android.bp index 6c37213005..17c11ab6c3 100644 --- a/common/fmq/aidl/Android.bp +++ b/common/fmq/aidl/Android.bp @@ -11,10 +11,7 @@ aidl_interface { name: "android.hardware.common.fmq", host_supported: true, vendor_available: true, - vndk: { - enabled: true, - support_system_process: true, - }, + double_loadable: true, srcs: [ "android/hardware/common/fmq/*.aidl", ], diff --git a/configstore/1.0/Android.bp b/configstore/1.0/Android.bp index 51fc44c2ca..ef781d26e0 100644 --- a/configstore/1.0/Android.bp +++ b/configstore/1.0/Android.bp @@ -12,9 +12,6 @@ package { hidl_interface { name: "android.hardware.configstore@1.0", root: "android.hardware", - vndk: { - enabled: true, - }, srcs: [ "types.hal", "ISurfaceFlingerConfigs.hal", diff --git a/configstore/1.1/Android.bp b/configstore/1.1/Android.bp index ec745dd2ba..c8c3f5e188 100644 --- a/configstore/1.1/Android.bp +++ b/configstore/1.1/Android.bp @@ -12,9 +12,6 @@ package { hidl_interface { name: "android.hardware.configstore@1.1", root: "android.hardware", - vndk: { - enabled: true, - }, srcs: [ "types.hal", "ISurfaceFlingerConfigs.hal", diff --git a/configstore/utils/Android.bp b/configstore/utils/Android.bp index 7ed3f68db2..b62f1bcba8 100644 --- a/configstore/utils/Android.bp +++ b/configstore/utils/Android.bp @@ -26,13 +26,10 @@ package { cc_library_shared { name: "android.hardware.configstore-utils", vendor_available: true, - vndk: { - enabled: true, - }, double_loadable: true, defaults: ["hidl_defaults"], - srcs: [ "ConfigStoreUtils.cpp" ], + srcs: ["ConfigStoreUtils.cpp"], export_include_dirs: ["include"], @@ -40,12 +37,12 @@ cc_library_shared { "android.hardware.configstore@1.0", "android.hardware.configstore@1.1", "libbase", - "libhidlbase" + "libhidlbase", ], export_shared_lib_headers: [ "android.hardware.configstore@1.0", "android.hardware.configstore@1.1", "libbase", - "libhidlbase" + "libhidlbase", ], } diff --git a/confirmationui/support/Android.bp b/confirmationui/support/Android.bp index 1200115fcb..67cc04b12a 100644 --- a/confirmationui/support/Android.bp +++ b/confirmationui/support/Android.bp @@ -27,9 +27,6 @@ cc_library { name: "android.hardware.confirmationui-support-lib", vendor_available: true, host_supported: true, - vndk: { - enabled: true, - }, srcs: [ "src/cbor.cpp", "src/confirmationui_utils.cpp", diff --git a/graphics/allocator/2.0/Android.bp b/graphics/allocator/2.0/Android.bp index 36158e9eb8..5d3f883369 100644 --- a/graphics/allocator/2.0/Android.bp +++ b/graphics/allocator/2.0/Android.bp @@ -13,9 +13,6 @@ package { hidl_interface { name: "android.hardware.graphics.allocator@2.0", root: "android.hardware", - vndk: { - enabled: true, - }, srcs: [ "IAllocator.hal", ], diff --git a/graphics/allocator/3.0/Android.bp b/graphics/allocator/3.0/Android.bp index 0100f6f336..767a79f84d 100644 --- a/graphics/allocator/3.0/Android.bp +++ b/graphics/allocator/3.0/Android.bp @@ -13,9 +13,6 @@ package { hidl_interface { name: "android.hardware.graphics.allocator@3.0", root: "android.hardware", - vndk: { - enabled: true, - }, srcs: [ "IAllocator.hal", ], diff --git a/graphics/allocator/4.0/Android.bp b/graphics/allocator/4.0/Android.bp index 5d7a4a991a..590ecf4cf7 100644 --- a/graphics/allocator/4.0/Android.bp +++ b/graphics/allocator/4.0/Android.bp @@ -13,9 +13,6 @@ package { hidl_interface { name: "android.hardware.graphics.allocator@4.0", root: "android.hardware", - vndk: { - enabled: true, - }, srcs: [ "IAllocator.hal", ], diff --git a/graphics/allocator/aidl/Android.bp b/graphics/allocator/aidl/Android.bp index 6e24edcab5..0b916bff18 100644 --- a/graphics/allocator/aidl/Android.bp +++ b/graphics/allocator/aidl/Android.bp @@ -11,10 +11,7 @@ package { aidl_interface { name: "android.hardware.graphics.allocator", vendor_available: true, - vndk: { - enabled: true, - support_system_process: true, - }, + double_loadable: true, vndk_use_version: "2", srcs: ["android/hardware/graphics/allocator/*.aidl"], imports: [ @@ -34,9 +31,6 @@ aidl_interface { "//apex_available:platform", "com.android.media.swcodec", ], - vndk: { - enabled: true, - }, min_sdk_version: "29", }, }, diff --git a/graphics/bufferqueue/1.0/Android.bp b/graphics/bufferqueue/1.0/Android.bp index fe46b5e4a8..c7c64536d1 100644 --- a/graphics/bufferqueue/1.0/Android.bp +++ b/graphics/bufferqueue/1.0/Android.bp @@ -13,9 +13,6 @@ package { hidl_interface { name: "android.hardware.graphics.bufferqueue@1.0", root: "android.hardware", - vndk: { - enabled: true, - }, srcs: [ "IGraphicBufferProducer.hal", "IProducerListener.hal", diff --git a/graphics/bufferqueue/2.0/Android.bp b/graphics/bufferqueue/2.0/Android.bp index c2b0985efd..e9f75c18b9 100644 --- a/graphics/bufferqueue/2.0/Android.bp +++ b/graphics/bufferqueue/2.0/Android.bp @@ -13,9 +13,6 @@ package { hidl_interface { name: "android.hardware.graphics.bufferqueue@2.0", root: "android.hardware", - vndk: { - enabled: true, - }, srcs: [ "types.hal", "IGraphicBufferProducer.hal", diff --git a/graphics/common/1.0/Android.bp b/graphics/common/1.0/Android.bp index 786953b4ce..b876bf30c7 100644 --- a/graphics/common/1.0/Android.bp +++ b/graphics/common/1.0/Android.bp @@ -13,10 +13,6 @@ package { hidl_interface { name: "android.hardware.graphics.common@1.0", root: "android.hardware", - vndk: { - enabled: true, - support_system_process: true, - }, srcs: [ "types.hal", ], diff --git a/graphics/common/1.1/Android.bp b/graphics/common/1.1/Android.bp index d857f8007e..ff6c9b7aa0 100644 --- a/graphics/common/1.1/Android.bp +++ b/graphics/common/1.1/Android.bp @@ -13,10 +13,6 @@ package { hidl_interface { name: "android.hardware.graphics.common@1.1", root: "android.hardware", - vndk: { - enabled: true, - support_system_process: true, - }, srcs: [ "types.hal", ], diff --git a/graphics/common/1.2/Android.bp b/graphics/common/1.2/Android.bp index 17d0c205c1..b4663e5ea5 100644 --- a/graphics/common/1.2/Android.bp +++ b/graphics/common/1.2/Android.bp @@ -13,10 +13,6 @@ package { hidl_interface { name: "android.hardware.graphics.common@1.2", root: "android.hardware", - vndk: { - enabled: true, - support_system_process: true, - }, srcs: [ "types.hal", ], diff --git a/graphics/common/aidl/Android.bp b/graphics/common/aidl/Android.bp index 570f735e1e..33d0938a92 100644 --- a/graphics/common/aidl/Android.bp +++ b/graphics/common/aidl/Android.bp @@ -12,10 +12,7 @@ aidl_interface { name: "android.hardware.graphics.common", host_supported: true, vendor_available: true, - vndk: { - enabled: true, - support_system_process: true, - }, + double_loadable: true, vndk_use_version: "5", srcs: [ "android/hardware/graphics/common/*.aidl", diff --git a/graphics/composer/aidl/Android.bp b/graphics/composer/aidl/Android.bp index 87ecb16a2f..fad70d840c 100644 --- a/graphics/composer/aidl/Android.bp +++ b/graphics/composer/aidl/Android.bp @@ -28,10 +28,7 @@ aidl_interface { name: "android.hardware.graphics.composer3", host_supported: true, vendor_available: true, - vndk: { - enabled: true, - support_system_process: true, - }, + double_loadable: true, frozen: true, vndk_use_version: "1", srcs: [ @@ -51,9 +48,6 @@ aidl_interface { enabled: false, }, ndk: { - vndk: { - enabled: true, - }, }, rust: { enabled: true, diff --git a/graphics/mapper/2.0/Android.bp b/graphics/mapper/2.0/Android.bp index 81040ab5b0..07ca1cb838 100644 --- a/graphics/mapper/2.0/Android.bp +++ b/graphics/mapper/2.0/Android.bp @@ -13,10 +13,6 @@ package { hidl_interface { name: "android.hardware.graphics.mapper@2.0", root: "android.hardware", - vndk: { - enabled: true, - support_system_process: true, - }, srcs: [ "types.hal", "IMapper.hal", diff --git a/graphics/mapper/2.1/Android.bp b/graphics/mapper/2.1/Android.bp index 1308a6cb67..f6e089a37d 100644 --- a/graphics/mapper/2.1/Android.bp +++ b/graphics/mapper/2.1/Android.bp @@ -13,10 +13,6 @@ package { hidl_interface { name: "android.hardware.graphics.mapper@2.1", root: "android.hardware", - vndk: { - enabled: true, - support_system_process: true, - }, srcs: [ "IMapper.hal", ], diff --git a/graphics/mapper/3.0/Android.bp b/graphics/mapper/3.0/Android.bp index b49806f9ed..0e15af95aa 100644 --- a/graphics/mapper/3.0/Android.bp +++ b/graphics/mapper/3.0/Android.bp @@ -13,10 +13,6 @@ package { hidl_interface { name: "android.hardware.graphics.mapper@3.0", root: "android.hardware", - vndk: { - enabled: true, - support_system_process: true, - }, srcs: [ "types.hal", "IMapper.hal", diff --git a/graphics/mapper/4.0/Android.bp b/graphics/mapper/4.0/Android.bp index c07f73c51a..b2dd7d29fb 100644 --- a/graphics/mapper/4.0/Android.bp +++ b/graphics/mapper/4.0/Android.bp @@ -13,10 +13,6 @@ package { hidl_interface { name: "android.hardware.graphics.mapper@4.0", root: "android.hardware", - vndk: { - enabled: true, - support_system_process: true, - }, srcs: [ "types.hal", "IMapper.hal", diff --git a/media/1.0/Android.bp b/media/1.0/Android.bp index 22a6d59f6f..d5ef95a73b 100644 --- a/media/1.0/Android.bp +++ b/media/1.0/Android.bp @@ -12,9 +12,6 @@ package { hidl_interface { name: "android.hardware.media@1.0", root: "android.hardware", - vndk: { - enabled: true, - }, srcs: [ "types.hal", ], diff --git a/media/bufferpool/2.0/Android.bp b/media/bufferpool/2.0/Android.bp index fd6f08b199..470a11f6c3 100644 --- a/media/bufferpool/2.0/Android.bp +++ b/media/bufferpool/2.0/Android.bp @@ -13,9 +13,6 @@ package { hidl_interface { name: "android.hardware.media.bufferpool@2.0", root: "android.hardware", - vndk: { - enabled: true, - }, srcs: [ "types.hal", "IAccessor.hal", diff --git a/media/omx/1.0/Android.bp b/media/omx/1.0/Android.bp index ea6346758d..cd1b9b6631 100644 --- a/media/omx/1.0/Android.bp +++ b/media/omx/1.0/Android.bp @@ -12,9 +12,6 @@ package { hidl_interface { name: "android.hardware.media.omx@1.0", root: "android.hardware", - vndk: { - enabled: true, - }, srcs: [ "types.hal", "IGraphicBufferSource.hal", diff --git a/memtrack/1.0/Android.bp b/memtrack/1.0/Android.bp index bf8db3f6f4..1aeec594ec 100644 --- a/memtrack/1.0/Android.bp +++ b/memtrack/1.0/Android.bp @@ -12,9 +12,6 @@ package { hidl_interface { name: "android.hardware.memtrack@1.0", root: "android.hardware", - vndk: { - enabled: true, - }, srcs: [ "types.hal", "IMemtrack.hal", diff --git a/memtrack/aidl/Android.bp b/memtrack/aidl/Android.bp index 0d1c241093..4973d1e7e9 100644 --- a/memtrack/aidl/Android.bp +++ b/memtrack/aidl/Android.bp @@ -34,9 +34,6 @@ aidl_interface { enabled: false, }, ndk: { - vndk: { - enabled: true, - }, }, }, frozen: true, diff --git a/renderscript/1.0/Android.bp b/renderscript/1.0/Android.bp index 1f2ac15f8f..c69914110b 100644 --- a/renderscript/1.0/Android.bp +++ b/renderscript/1.0/Android.bp @@ -14,10 +14,6 @@ hidl_interface { root: "android.hardware", // TODO(b/153609531): remove when no longer needed. native_bridge_supported: true, - vndk: { - enabled: true, - support_system_process: true, - }, srcs: [ "types.hal", "IContext.hal", diff --git a/soundtrigger/2.0/Android.bp b/soundtrigger/2.0/Android.bp index 996105cc8f..828b9ecfc4 100644 --- a/soundtrigger/2.0/Android.bp +++ b/soundtrigger/2.0/Android.bp @@ -12,9 +12,6 @@ package { hidl_interface { name: "android.hardware.soundtrigger@2.0", root: "android.hardware", - vndk: { - enabled: true, - }, srcs: [ "types.hal", "ISoundTriggerHw.hal", diff --git a/soundtrigger/2.0/default/Android.bp b/soundtrigger/2.0/default/Android.bp index 8236e3012e..2cbf0416f0 100644 --- a/soundtrigger/2.0/default/Android.bp +++ b/soundtrigger/2.0/default/Android.bp @@ -26,9 +26,6 @@ cc_library_shared { name: "android.hardware.soundtrigger@2.0-core", defaults: ["hidl_defaults"], vendor_available: true, - vndk: { - enabled: true, - }, srcs: [ "SoundTriggerHalImpl.cpp", ],