Remove AIDL-libs from VNDK

Some are still in VNDK because they are used in other VNDK libs. Bug: 234181591 Test: m Merged-In: If999df9c78a20df931177da11742b1c5de19bc08 Change-Id: If999df9c78a20df931177da11742b1c5de19bc08
2026-02-01 05:49:27 +00:00 · 2022-05-30 16:14:23 +09:00
parent 19410a1fc3
commit d81d6a12be
26 changed files with 0 additions and 155 deletions
--- a/audio/aidl/Android.bp
+++ b/audio/aidl/Android.bp
@@ -44,9 +44,6 @@ aidl_interface {
            platform_apis: true,
        },
        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
@@ -18,11 +18,6 @@ aidl_interface {
        java: {
            platform_apis: true,
        },
-        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/dumpstate/aidl/Android.bp
+++ b/dumpstate/aidl/Android.bp
@@ -33,10 +33,5 @@ aidl_interface {
        java: {
            enabled: false,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
 }
--- a/gnss/aidl/Android.bp
+++ b/gnss/aidl/Android.bp
@@ -32,11 +32,6 @@ aidl_interface {
        java: {
            platform_apis: true,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
    versions: ["1"],
 }
--- 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,
-            },
-        },
    },
 }

--- 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/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: ["1"],
 }
--- a/nfc/aidl/Android.bp
+++ b/nfc/aidl/Android.bp
@@ -34,10 +34,5 @@ aidl_interface {
            sdk_version: "module_current",
            enabled: false,
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
 }
--- 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: [
        "1",
--- 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,
-            },
-        },
    },
 }

@@ -42,11 +37,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
 }

@@ -64,11 +54,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
 }

@@ -86,11 +71,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
 }

@@ -108,11 +88,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
 }

@@ -130,11 +105,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
 }

@@ -155,11 +125,6 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
 }

@@ -177,10 +142,5 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
 }
--- 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/usb/aidl/Android.bp
+++ b/usb/aidl/Android.bp
@@ -33,10 +33,5 @@ aidl_interface {
        java: {
            sdk_version: "module_current",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
 }
--- 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,10 +37,5 @@ aidl_interface {
            ],
            min_sdk_version: "30",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
 }
--- a/wifi/supplicant/aidl/Android.bp
+++ b/wifi/supplicant/aidl/Android.bp
@@ -37,10 +37,5 @@ aidl_interface {
            ],
            min_sdk_version: "30",
        },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
    },
 }