Merge "Remove VNDK definition(s)" into main

2024-03-15 01:37:03 +00:00 · 2024-03-15 01:37:03 +00:00 · b3b01a6cc2
commit b3b01a6cc2
parent da461791be 09639b93ba
31 changed files with 8 additions and 115 deletions
--- 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",
    ],
--- 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",
        },
    },
--- 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",
--- 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",
    ],
--- 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",
--- 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",
--- a/configstore/utils/Android.bp
+++ b/configstore/utils/Android.bp
@ -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",
    ],
 }
--- 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",
--- 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",
    ],
--- 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",
    ],
--- 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",
    ],
--- 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",
        },
    },
--- 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",
--- 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",
--- 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",
    ],
--- 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",
    ],
--- 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",
    ],
--- 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",
--- 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,
--- 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",
--- 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",
    ],
--- 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",
--- 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",
--- 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",
    ],
--- 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",
--- 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",
--- 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",
--- a/memtrack/aidl/Android.bp
+++ b/memtrack/aidl/Android.bp
@ -34,9 +34,6 @@ aidl_interface {
            enabled: false,
        },
        ndk: {
-            vndk: {
-                enabled: true,
-            },
        },
    },
    frozen: true,
--- 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",
--- 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",
--- 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",
    ],