commit b70524066f3724ee26a33b34bf6bec2afe90bf43
author Pechetty Sravani <pechetty@google.com> Wed Jun 05 05:12:40 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 05 05:12:40 2024 +0000
tree 703cf98a3eb5a8ca9b3c4f2f5ca4f784a15ab7bc
parent bf5b7005704ff890e2d25e51efa817944f0f7128
parent 6f88ec9cfe3318b9be6101395a04899c36dd535b

Merge "Revert "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 1f5742d..431059b 100644
--- a/common/aidl/Android.bp
+++ b/common/aidl/Android.bp
@@ -13,6 +13,7 @@
     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 7bb6b50..0b916bf 100644
--- a/graphics/allocator/aidl/Android.bp
+++ b/graphics/allocator/aidl/Android.bp
@@ -12,6 +12,7 @@
     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 1eee5bf..c1bb1ef 100644
--- a/graphics/common/aidl/Android.bp
+++ b/graphics/common/aidl/Android.bp
@@ -13,6 +13,7 @@
     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 5165060..9b6b196 100644
--- a/graphics/composer/aidl/Android.bp
+++ b/graphics/composer/aidl/Android.bp
@@ -30,6 +30,7 @@
     vendor_available: true,
     double_loadable: true,
     frozen: false,
+    vndk_use_version: "1",
     srcs: [
         "android/hardware/graphics/composer3/*.aidl",
     ],