commit 7adb4d0e2d6506b90545e651366eb4850a18a499
author Karuna Wadhera <kwadhera@google.com> Thu Oct 10 00:38:51 2024 +0000
committer Karuna Wadhera <kwadhera@google.com> Thu Nov 14 07:13:51 2024 +0000
tree cb975384b21663458d9184e4b8f98d5a230be99b
parent ad54f58a7d670233d57a862955ee238dcadbe4c6

Bump KeyMint and Keystore version

Bug: 369375199
Test: treehugger
Change-Id: Ie41d0760d6f12e1ff04a7ac1274fce600cc21db1

Android.bp

diff --git a/Android.bp b/Android.bp
index d2e8003..dc48668 100644
--- a/Android.bp
+++ b/Android.bp
@@ -105,7 +105,6 @@
         ":android.hardware.radio.data-V3-java-source",
         ":android.hardware.radio.network-V3-java-source",
         ":android.hardware.radio.voice-V3-java-source",
-        ":android.hardware.security.keymint-V3-java-source",
         ":android.hardware.security.secureclock-V1-java-source",
         ":android.hardware.thermal-V2-java-source",
         ":android.hardware.tv.tuner-V2-java-source",
@@ -114,7 +113,6 @@
         ":android.security.legacykeystore-java-source",
         ":android.security.maintenance-java-source",
         ":android.security.metrics-java-source",
-        ":android.system.keystore2-V4-java-source",
         ":android.hardware.cas-V1-java-source",
         ":credstore_aidl",
         ":dumpstate_aidl",
@@ -149,7 +147,16 @@
         ":framework-javastream-protos",
         ":statslog-framework-java-gen", // FrameworkStatsLog.java
         ":audio_policy_configuration_V7_0",
-    ],
+    ] + select(release_flag("RELEASE_ATTEST_MODULES"), {
+        true: [
+            ":android.hardware.security.keymint-V4-java-source",
+            ":android.system.keystore2-V5-java-source",
+        ],
+        default: [
+            ":android.hardware.security.keymint-V3-java-source",
+            ":android.system.keystore2-V4-java-source",
+        ],
+    }),
 }
 
 java_library {