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

Author: Kiyoung Kim

Diff for: 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 for: automotive/evs/aidl/Android.bp

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

Diff for: 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 for: 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 for: configstore/1.0/Android.bp

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

Diff for: configstore/1.1/Android.bp

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

Diff for: configstore/utils/Android.bp

@@ -26,26 +26,23 @@ 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"],
 
     shared_libs: [
         "[email protected]",
         "[email protected]",
         "libbase",
-        "libhidlbase"
+        "libhidlbase",
     ],
     export_shared_lib_headers: [
         "[email protected]",
         "[email protected]",
         "libbase",
-        "libhidlbase"
+        "libhidlbase",
     ],
 }

Diff for: 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 for: graphics/allocator/2.0/Android.bp

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

Diff for: graphics/allocator/3.0/Android.bp

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

Diff for: graphics/allocator/4.0/Android.bp

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

Diff for: 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 for: graphics/bufferqueue/1.0/Android.bp

@@ -13,9 +13,6 @@ package {
 hidl_interface {
     name: "[email protected]",
     root: "android.hardware",
-    vndk: {
-        enabled: true,
-    },
     srcs: [
         "IGraphicBufferProducer.hal",
         "IProducerListener.hal",

Diff for: graphics/bufferqueue/2.0/Android.bp

@@ -13,9 +13,6 @@ package {
 hidl_interface {
     name: "[email protected]",
     root: "android.hardware",
-    vndk: {
-        enabled: true,
-    },
     srcs: [
         "types.hal",
         "IGraphicBufferProducer.hal",

Diff for: graphics/common/1.0/Android.bp

@@ -13,10 +13,6 @@ package {
 hidl_interface {
     name: "[email protected]",
     root: "android.hardware",
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
     srcs: [
         "types.hal",
     ],

Diff for: graphics/common/1.1/Android.bp

@@ -13,10 +13,6 @@ package {
 hidl_interface {
     name: "[email protected]",
     root: "android.hardware",
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
     srcs: [
         "types.hal",
     ],

Diff for: graphics/common/1.2/Android.bp

@@ -13,10 +13,6 @@ package {
 hidl_interface {
     name: "[email protected]",
     root: "android.hardware",
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
     srcs: [
         "types.hal",
     ],

Diff for: 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 for: 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 for: graphics/mapper/2.0/Android.bp

@@ -13,10 +13,6 @@ package {
 hidl_interface {
     name: "[email protected]",
     root: "android.hardware",
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
     srcs: [
         "types.hal",
         "IMapper.hal",

Diff for: graphics/mapper/2.1/Android.bp

@@ -13,10 +13,6 @@ package {
 hidl_interface {
     name: "[email protected]",
     root: "android.hardware",
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
     srcs: [
         "IMapper.hal",
     ],

Diff for: graphics/mapper/3.0/Android.bp

@@ -13,10 +13,6 @@ package {
 hidl_interface {
     name: "[email protected]",
     root: "android.hardware",
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
     srcs: [
         "types.hal",
         "IMapper.hal",

Diff for: graphics/mapper/4.0/Android.bp

@@ -13,10 +13,6 @@ package {
 hidl_interface {
     name: "[email protected]",
     root: "android.hardware",
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
     srcs: [
         "types.hal",
         "IMapper.hal",

Diff for: media/1.0/Android.bp

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

Diff for: media/bufferpool/2.0/Android.bp

@@ -13,9 +13,6 @@ package {
 hidl_interface {
     name: "[email protected]",
     root: "android.hardware",
-    vndk: {
-        enabled: true,
-    },
     srcs: [
         "types.hal",
         "IAccessor.hal",

Diff for: media/omx/1.0/Android.bp

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

Diff for: memtrack/1.0/Android.bp

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

Diff for: memtrack/aidl/Android.bp

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

Diff for: 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 for: soundtrigger/2.0/Android.bp

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

Diff for: soundtrigger/2.0/default/Android.bp

@@ -26,9 +26,6 @@ cc_library_shared {
     name: "[email protected]",
     defaults: ["hidl_defaults"],
     vendor_available: true,
-    vndk: {
-        enabled: true,
-    },
     srcs: [
         "SoundTriggerHalImpl.cpp",
     ],