From c42a2a686271b78d2b75436a620d7d252ef6d08a Mon Sep 17 00:00:00 2001
From: Karuna Wadhera <kwadhera@google.com>
Date: Wed, 23 Oct 2024 04:29:37 +0000
Subject: [PATCH] Add versioned libkeymint_support

Bug: 369375199
Test: Treehugger
Change-Id: I5eab3a222aeba26640c3d03e52242ee5c2c2b277
---
 security/keymint/support/Android.bp | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/security/keymint/support/Android.bp b/security/keymint/support/Android.bp
index 5c9efef046..c6e35abd00 100644
--- a/security/keymint/support/Android.bp
+++ b/security/keymint/support/Android.bp
@@ -40,6 +40,9 @@ cc_library {
     export_include_dirs: [
         "include",
     ],
+    header_libs: [
+        "libhardware_headers",
+    ],
     defaults: [
         "keymint_use_latest_hal_aidl_ndk_shared",
     ],
@@ -51,6 +54,35 @@ cc_library {
     ],
 }
 
+cc_library {
+    name: "libkeymint_support_V3",
+    vendor_available: true,
+    cflags: [
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+    ],
+    srcs: [
+        "attestation_record.cpp",
+        "authorization_set.cpp",
+        "keymint_utils.cpp",
+        "key_param_output.cpp",
+    ],
+    export_include_dirs: [
+        "include",
+    ],
+    header_libs: [
+        "libhardware_headers",
+    ],
+    shared_libs: [
+        "android.hardware.security.keymint-V3-ndk",
+        "libbase",
+        "libcrypto",
+        "libutils",
+        "libhardware",
+    ],
+}
+
 cc_library {
     name: "libkeymint_remote_prov_support",
     vendor_available: true,