commit 8cdcadcbe4fa39c9de1b0d6c232d05d525c98478
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jun 10 02:31:11 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 10 02:31:11 2024 +0000
tree c06643d7bf62bc81d06aeddf5d0f5bece0519923
parent 7f89d61751eeaa17a456c1196ab9c9bc443f5c36
parent 377b466018845a78c27c2ce31542662f636856ff

Merge "Revert^2 "Remove Vndk_use_version property from AIDL"" into main

common/aidl/Android.bp

diff --git a/common/aidl/Android.bp b/common/aidl/Android.bp
index 431059b..1f5742d 100644
--- a/common/aidl/Android.bp
+++ b/common/aidl/Android.bp
@@ -13,7 +13,6 @@
     vendor_available: true,
     product_available: true,
     double_loadable: true,
-    vndk_use_version: "2",
     srcs: [
         "android/hardware/common/*.aidl",
     ],

graphics/allocator/aidl/Android.bp

diff --git a/graphics/allocator/aidl/Android.bp b/graphics/allocator/aidl/Android.bp
index 0b916bf..7bb6b50 100644
--- a/graphics/allocator/aidl/Android.bp
+++ b/graphics/allocator/aidl/Android.bp
@@ -12,7 +12,6 @@
     name: "android.hardware.graphics.allocator",
     vendor_available: true,
     double_loadable: true,
-    vndk_use_version: "2",
     srcs: ["android/hardware/graphics/allocator/*.aidl"],
     imports: [
         "android.hardware.common-V2",

graphics/common/aidl/Android.bp

diff --git a/graphics/common/aidl/Android.bp b/graphics/common/aidl/Android.bp
index c1bb1ef..1eee5bf 100644
--- a/graphics/common/aidl/Android.bp
+++ b/graphics/common/aidl/Android.bp
@@ -13,7 +13,6 @@
     host_supported: true,
     vendor_available: true,
     double_loadable: true,
-    vndk_use_version: "5",
     srcs: [
         "android/hardware/graphics/common/*.aidl",
     ],

graphics/composer/aidl/Android.bp

diff --git a/graphics/composer/aidl/Android.bp b/graphics/composer/aidl/Android.bp
index 9b6b196..5165060 100644
--- a/graphics/composer/aidl/Android.bp
+++ b/graphics/composer/aidl/Android.bp
@@ -30,7 +30,6 @@
     vendor_available: true,
     double_loadable: true,
     frozen: false,
-    vndk_use_version: "1",
     srcs: [
         "android/hardware/graphics/composer3/*.aidl",
     ],