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.

Bug: 328994089
Test: AOSP CF build succeeded
Change-Id: Ifdade9c052db29c989ce7d804ba725361c4c0f8e
Merged-In: Ic4f19113c1a25dc1fb60cdfbf9c0f2d8d7d09726
This commit is contained in:
Kiyoung Kim 2024-03-11 13:04:36 +09:00
parent cfa68a1fbb
commit 9e9d41d162
31 changed files with 8 additions and 117 deletions

View file

@ -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",
],

View file

@ -42,9 +42,6 @@ aidl_interface {
enabled: false,
},
ndk: {
vndk: {
enabled: false,
},
min_sdk_version: "29",
},
},

View file

@ -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",

View file

@ -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",
],

View file

@ -12,9 +12,6 @@ package {
hidl_interface {
name: "android.hardware.configstore@1.0",
root: "android.hardware",
vndk: {
enabled: true,
},
srcs: [
"types.hal",
"ISurfaceFlingerConfigs.hal",

View file

@ -12,9 +12,6 @@ package {
hidl_interface {
name: "android.hardware.configstore@1.1",
root: "android.hardware",
vndk: {
enabled: true,
},
srcs: [
"types.hal",
"ISurfaceFlingerConfigs.hal",

View file

@ -26,9 +26,6 @@ package {
cc_library_shared {
name: "android.hardware.configstore-utils",
vendor_available: true,
vndk: {
enabled: true,
},
double_loadable: true,
defaults: ["hidl_defaults"],
@ -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",
],
}

View file

@ -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",

View file

@ -13,9 +13,6 @@ package {
hidl_interface {
name: "android.hardware.graphics.allocator@2.0",
root: "android.hardware",
vndk: {
enabled: true,
},
srcs: [
"IAllocator.hal",
],

View file

@ -13,9 +13,6 @@ package {
hidl_interface {
name: "android.hardware.graphics.allocator@3.0",
root: "android.hardware",
vndk: {
enabled: true,
},
srcs: [
"IAllocator.hal",
],

View file

@ -13,9 +13,6 @@ package {
hidl_interface {
name: "android.hardware.graphics.allocator@4.0",
root: "android.hardware",
vndk: {
enabled: true,
},
srcs: [
"IAllocator.hal",
],

View file

@ -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",
},
},

View file

@ -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",

View file

@ -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",

View file

@ -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",
],

View file

@ -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",
],

View file

@ -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",
],

View file

@ -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",

View file

@ -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: false,
vndk_use_version: "1",
srcs: [
@ -50,11 +47,6 @@ aidl_interface {
sdk_version: "module_current",
enabled: false,
},
ndk: {
vndk: {
enabled: true,
},
},
rust: {
enabled: true,
},

View file

@ -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",

View file

@ -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",
],

View file

@ -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",

View file

@ -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",

View file

@ -12,9 +12,6 @@ package {
hidl_interface {
name: "android.hardware.media@1.0",
root: "android.hardware",
vndk: {
enabled: true,
},
srcs: [
"types.hal",
],

View file

@ -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",

View file

@ -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",

View file

@ -12,9 +12,6 @@ package {
hidl_interface {
name: "android.hardware.memtrack@1.0",
root: "android.hardware",
vndk: {
enabled: true,
},
srcs: [
"types.hal",
"IMemtrack.hal",

View file

@ -34,9 +34,6 @@ aidl_interface {
enabled: false,
},
ndk: {
vndk: {
enabled: true,
},
},
},
frozen: true,

View file

@ -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",

View file

@ -12,9 +12,6 @@ package {
hidl_interface {
name: "android.hardware.soundtrigger@2.0",
root: "android.hardware",
vndk: {
enabled: true,
},
srcs: [
"types.hal",
"ISoundTriggerHw.hal",

View file

@ -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",
],