From fbe0dbfe121c96c0a1cbb8e61d8699a693b94e4d Mon Sep 17 00:00:00 2001
From: Kiyoung Kim <kiyoungkim@google.com>
Date: Mon, 11 Mar 2024 13:04:36 +0900
Subject: 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.

Bug: 328994089
Test: AOSP CF build succeeded
Change-Id: I1f58764ffc7d94e20c72c250f1ace2fc0fea2fdf
---
 automotive/display/aidl/Android.bp    | 3 ---
 cameraservice/common/aidl/Android.bp  | 5 -----
 cameraservice/device/aidl/Android.bp  | 3 ---
 cameraservice/service/aidl/Android.bp | 3 ---
 4 files changed, 14 deletions(-)

diff --git a/automotive/display/aidl/Android.bp b/automotive/display/aidl/Android.bp
index 5c017ef..f7ed918 100644
--- a/automotive/display/aidl/Android.bp
+++ b/automotive/display/aidl/Android.bp
@@ -37,9 +37,6 @@ aidl_interface {
             enabled: false,
         },
         ndk: {
-            vndk: {
-                enabled: false,
-            },
             additional_shared_libraries: [
                 "libnativewindow",
             ],
diff --git a/cameraservice/common/aidl/Android.bp b/cameraservice/common/aidl/Android.bp
index 9916d3c..8150f14 100644
--- a/cameraservice/common/aidl/Android.bp
+++ b/cameraservice/common/aidl/Android.bp
@@ -15,11 +15,6 @@ aidl_interface {
         java: {
             enabled: false,
         },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
     },
     vndk_use_version: "1",
     versions_with_info: [
diff --git a/cameraservice/device/aidl/Android.bp b/cameraservice/device/aidl/Android.bp
index 4691b8f..1f50af3 100644
--- a/cameraservice/device/aidl/Android.bp
+++ b/cameraservice/device/aidl/Android.bp
@@ -30,9 +30,6 @@ aidl_interface {
             additional_shared_libraries: [
                 "libnativewindow",
             ],
-            vndk: {
-                enabled: true,
-            },
         },
     },
     vndk_use_version: "2",
diff --git a/cameraservice/service/aidl/Android.bp b/cameraservice/service/aidl/Android.bp
index 501cc11..44d153b 100644
--- a/cameraservice/service/aidl/Android.bp
+++ b/cameraservice/service/aidl/Android.bp
@@ -26,9 +26,6 @@ aidl_interface {
             additional_shared_libraries: [
                 "libnativewindow",
             ],
-            vndk: {
-                enabled: true,
-            },
         },
     },
     vndk_use_version: "2",
-- 
cgit v1.2.3