tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove VNDK definition(s)

Browse source 
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
This commit is contained in:
Kiyoung Kim 2024-03-12 16:53:54 +09:00
parent f243840dbc
commit 09639b93ba
31 changed files with 8 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
audio/common/2.0/Android.bp
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",
],

3
automotive/evs/aidl/Android.bp
View file

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

5
common/aidl/Android.bp
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",

5
common/fmq/aidl/Android.bp
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",
],

3
configstore/1.0/Android.bp
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",

3
configstore/1.1/Android.bp
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",

9
configstore/utils/Android.bp
View file

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

3
confirmationui/support/Android.bp
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",

3
graphics/allocator/2.0/Android.bp
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",
],

3
graphics/allocator/3.0/Android.bp
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",
],

3
graphics/allocator/4.0/Android.bp
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",
],

8
graphics/allocator/aidl/Android.bp
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",
},
},

3
graphics/bufferqueue/1.0/Android.bp
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",

3
graphics/bufferqueue/2.0/Android.bp
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",

4
graphics/common/1.0/Android.bp
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",
],

4
graphics/common/1.1/Android.bp
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",
],

4
graphics/common/1.2/Android.bp
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",
],

5
graphics/common/aidl/Android.bp
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",

8
graphics/composer/aidl/Android.bp
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: true,
vndk_use_version: "1",
srcs: [
@ -51,9 +48,6 @@ aidl_interface {
enabled: false,
},
ndk: {
vndk: {
enabled: true,
},
},
rust: {
enabled: true,

4
graphics/mapper/2.0/Android.bp
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",

4
graphics/mapper/2.1/Android.bp
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",
],

4
graphics/mapper/3.0/Android.bp
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",

4
graphics/mapper/4.0/Android.bp
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",

3
media/1.0/Android.bp
View file

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

3
media/bufferpool/2.0/Android.bp
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",

3
media/omx/1.0/Android.bp
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",

3
memtrack/1.0/Android.bp
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",

3
memtrack/aidl/Android.bp
View file

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

4
renderscript/1.0/Android.bp
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",

3
soundtrigger/2.0/Android.bp
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",

3
soundtrigger/2.0/default/Android.bp
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",
],