From 6f88ec9cfe3318b9be6101395a04899c36dd535b Mon Sep 17 00:00:00 2001
From: Pechetty Sravani <pechetty@google.com>
Date: Wed, 5 Jun 2024 03:42:29 +0000
Subject: [PATCH] Revert "Remove Vndk_use_version property from AIDL"

Revert submission 3102645-no_vndk_aidl

Reason for revert: Droidmonitor triggered revert due to build breakage in b/345063864. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:3102645-no_vndk_aidl

Change-Id: Idc33bb7fbad72d18ac46a69639ac81bf554d469f
---
 common/aidl/Android.bp             | 1 +
 graphics/allocator/aidl/Android.bp | 1 +
 graphics/common/aidl/Android.bp    | 1 +
 graphics/composer/aidl/Android.bp  | 1 +
 4 files changed, 4 insertions(+)

diff --git a/common/aidl/Android.bp b/common/aidl/Android.bp
index 1f5742d526..431059ba3b 100644
--- a/common/aidl/Android.bp
+++ b/common/aidl/Android.bp
@@ -13,6 +13,7 @@ aidl_interface {
     vendor_available: true,
     product_available: true,
     double_loadable: true,
+    vndk_use_version: "2",
     srcs: [
         "android/hardware/common/*.aidl",
     ],
diff --git a/graphics/allocator/aidl/Android.bp b/graphics/allocator/aidl/Android.bp
index 7bb6b504bf..0b916bff18 100644
--- a/graphics/allocator/aidl/Android.bp
+++ b/graphics/allocator/aidl/Android.bp
@@ -12,6 +12,7 @@ aidl_interface {
     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",
diff --git a/graphics/common/aidl/Android.bp b/graphics/common/aidl/Android.bp
index 1eee5bfd97..c1bb1efdd1 100644
--- a/graphics/common/aidl/Android.bp
+++ b/graphics/common/aidl/Android.bp
@@ -13,6 +13,7 @@ aidl_interface {
     host_supported: true,
     vendor_available: true,
     double_loadable: true,
+    vndk_use_version: "5",
     srcs: [
         "android/hardware/graphics/common/*.aidl",
     ],
diff --git a/graphics/composer/aidl/Android.bp b/graphics/composer/aidl/Android.bp
index 5165060c3f..9b6b196e98 100644
--- a/graphics/composer/aidl/Android.bp
+++ b/graphics/composer/aidl/Android.bp
@@ -30,6 +30,7 @@ aidl_interface {
     vendor_available: true,
     double_loadable: true,
     frozen: false,
+    vndk_use_version: "1",
     srcs: [
         "android/hardware/graphics/composer3/*.aidl",
     ],