Merge "Remove AIDL-libs from VNDK" into tm-dev-plus-aosp am: 212b1e7610

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/18869738 Change-Id: I5b1cd8ba31ae989d5e7ee1043119b1fb7a17108e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 01:47:40 +00:00 · 2022-06-16 01:47:40 +00:00 · fdc3418cc9
commit fdc3418cc9
parent f08b3864f0 212b1e7610
35 changed files with 0 additions and 196 deletions
--- a/audio/aidl/Android.bp
+++ b/audio/aidl/Android.bp
@ -49,9 +49,6 @@ aidl_interface {
            ],
        },
        ndk: {
-            vndk: {
-                enabled: true,
-            },
            apex_available: [
                "//apex_available:platform",
                "com.android.bluetooth",
--- a/authsecret/aidl/Android.bp
+++ b/authsecret/aidl/Android.bp
@ -16,11 +16,6 @@ aidl_interface {
        java: {
            platform_apis: true,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions: ["1"],
 }
--- a/automotive/occupant_awareness/aidl/Android.bp
+++ b/automotive/occupant_awareness/aidl/Android.bp
@ -23,11 +23,6 @@ aidl_interface {
                "com.android.car.framework",
            ],
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions: ["1"],
 }
--- a/bluetooth/audio/aidl/Android.bp
+++ b/bluetooth/audio/aidl/Android.bp
@ -40,9 +40,6 @@ aidl_interface {
            enabled: false,
        },
        ndk: {
-            vndk: {
-                enabled: true,
-            },
            apex_available: [
                "//apex_available:platform",
                "com.android.bluetooth",
--- a/camera/common/aidl/Android.bp
+++ b/camera/common/aidl/Android.bp
@ -19,11 +19,6 @@ aidl_interface {
        java: {
            enabled: false,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
--- a/camera/device/aidl/Android.bp
+++ b/camera/device/aidl/Android.bp
@ -27,11 +27,6 @@ aidl_interface {
            sdk_version: "module_current",
            enabled: false,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
--- a/camera/metadata/aidl/Android.bp
+++ b/camera/metadata/aidl/Android.bp
@ -19,11 +19,6 @@ aidl_interface {
        java: {
            enabled: false,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
--- a/camera/provider/aidl/Android.bp
+++ b/camera/provider/aidl/Android.bp
@ -25,11 +25,6 @@ aidl_interface {
        cpp: {
            enabled: false,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
--- a/drm/aidl/Android.bp
+++ b/drm/aidl/Android.bp
@ -23,9 +23,6 @@ aidl_interface {
            sdk_version: "module_current",
        },
        ndk: {
-            vndk: {
-                enabled: true,
-            },
            min_sdk_version: "current",
        },
    },
--- a/dumpstate/aidl/Android.bp
+++ b/dumpstate/aidl/Android.bp
@ -33,11 +33,6 @@ aidl_interface {
        java: {
            enabled: false,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
--- a/gnss/aidl/Android.bp
+++ b/gnss/aidl/Android.bp
@ -36,11 +36,6 @@ aidl_interface {
        java: {
            platform_apis: true,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
--- a/health/aidl/Android.bp
+++ b/health/aidl/Android.bp
@ -36,11 +36,6 @@ aidl_interface {
            enabled: true,
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
--- a/health/storage/aidl/Android.bp
+++ b/health/storage/aidl/Android.bp
@ -33,11 +33,6 @@ aidl_interface {
        java: {
            enabled: false,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions: ["1"],
 }
--- a/identity/aidl/Android.bp
+++ b/identity/aidl/Android.bp
@ -23,9 +23,6 @@ aidl_interface {
            platform_apis: true,
        },
        ndk: {
-            vndk: {
-                enabled: true,
-            },
            apps_enabled: false,
        },
    },
--- a/ir/aidl/Android.bp
+++ b/ir/aidl/Android.bp
@ -33,11 +33,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
--- a/keymaster/aidl/Android.bp
+++ b/keymaster/aidl/Android.bp
@ -18,11 +18,6 @@ aidl_interface {
        java: {
            platform_apis: true,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions: [
        "1",
--- a/light/aidl/Android.bp
+++ b/light/aidl/Android.bp
@ -18,11 +18,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
--- a/nfc/aidl/Android.bp
+++ b/nfc/aidl/Android.bp
@ -34,11 +34,6 @@ aidl_interface {
            sdk_version: "module_current",
            enabled: false,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
--- a/oemlock/aidl/Android.bp
+++ b/oemlock/aidl/Android.bp
@ -16,11 +16,6 @@ aidl_interface {
        java: {
            platform_apis: true,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions: ["1"],
 }
--- a/power/aidl/Android.bp
+++ b/power/aidl/Android.bp
@ -35,11 +35,6 @@ aidl_interface {
        java: {
            platform_apis: true,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
--- a/power/stats/aidl/Android.bp
+++ b/power/stats/aidl/Android.bp
@ -32,11 +32,6 @@ aidl_interface {
        java: {
            platform_apis: true,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
        cpp: {
            enabled: true,
        },
--- a/radio/aidl/Android.bp
+++ b/radio/aidl/Android.bp
@ -20,11 +20,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
@ -49,11 +44,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
@ -78,11 +68,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
@ -107,11 +92,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
@ -136,11 +116,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
@ -165,11 +140,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
@ -197,11 +167,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
@ -229,11 +194,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
--- a/rebootescrow/aidl/Android.bp
+++ b/rebootescrow/aidl/Android.bp
@ -18,11 +18,6 @@ aidl_interface {
        java: {
            platform_apis: true,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions: ["1"],
 }
--- a/security/dice/aidl/Android.bp
+++ b/security/dice/aidl/Android.bp
@ -34,9 +34,6 @@ aidl_interface {
            platform_apis: false,
        },
        ndk: {
-            vndk: {
-                enabled: true,
-            },
            apps_enabled: false,
            apex_available: [
                "//apex_available:platform",
--- a/security/keymint/aidl/Android.bp
+++ b/security/keymint/aidl/Android.bp
@ -22,9 +22,6 @@ aidl_interface {
            platform_apis: true,
        },
        ndk: {
-            vndk: {
-                enabled: true,
-            },
            apps_enabled: false,
        },
        rust: {
--- a/security/secureclock/aidl/Android.bp
+++ b/security/secureclock/aidl/Android.bp
@ -18,11 +18,6 @@ aidl_interface {
        java: {
            platform_apis: true,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
        rust: {
            enabled: true,
            apex_available: [
--- a/security/sharedsecret/aidl/Android.bp
+++ b/security/sharedsecret/aidl/Android.bp
@ -18,11 +18,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
        rust: {
            enabled: true,
        },
--- a/sensors/aidl/Android.bp
+++ b/sensors/aidl/Android.bp
@ -23,11 +23,6 @@ aidl_interface {
        java: {
            enabled: false,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
--- a/soundtrigger/aidl/Android.bp
+++ b/soundtrigger/aidl/Android.bp
@ -33,11 +33,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
--- a/usb/aidl/Android.bp
+++ b/usb/aidl/Android.bp
@ -33,11 +33,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
--- a/uwb/aidl/Android.bp
+++ b/uwb/aidl/Android.bp
@ -21,9 +21,6 @@ aidl_interface {
            enabled: false,
        },
        ndk: {
-            vndk: {
-                enabled: true,
-            },
            apex_available: [
                "//apex_available:platform",
                "com.android.uwb",
--- a/vibrator/aidl/Android.bp
+++ b/vibrator/aidl/Android.bp
@ -19,11 +19,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions: [
        "1",
--- a/weaver/aidl/Android.bp
+++ b/weaver/aidl/Android.bp
@ -16,11 +16,6 @@ aidl_interface {
        java: {
            platform_apis: true,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions: ["1"],
 }
--- a/wifi/hostapd/aidl/Android.bp
+++ b/wifi/hostapd/aidl/Android.bp
@ -37,11 +37,6 @@ aidl_interface {
            ],
            min_sdk_version: "30",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {
--- a/wifi/supplicant/aidl/Android.bp
+++ b/wifi/supplicant/aidl/Android.bp
@ -37,11 +37,6 @@ aidl_interface {
            ],
            min_sdk_version: "30",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions_with_info: [
        {