commit 6b96760c1be3c517d549edcb96a35798788edd27
author David Drysdale <drysdale@google.com> Mon Dec 13 16:01:21 2021 +0000
committer David Drysdale <drysdale@google.com> Mon Dec 13 16:01:21 2021 +0000
tree 1e373579ee7a2318c7ff1840b91ba5bb58731625
parent 6c44cad429721ebaf2216d412aa7f9417936cd70

Revert "Bump keystore2 AIDL API version 1->2"

Revert "Advertise support of KeyMint V2"

Revert submission 1900930-version-bump

Reason for revert: Broken build on sc-qpr1-dev-plus-aosp, b/210450339
Reverted Changes:
I42a9b854f:keystore2: cope with new curve25519 enum
I167d568d6:Bump keystore2 AIDL API version 1->2
I3a16d072e:Advertise support of KeyMint V2
Ibf2325329:KeyMint HAL: add curve 25519, bump version

Change-Id: Ifc713bfb2753677e933f572d385f26cea11a3ef2

keystore2/Android.bp

diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 520237a..3097bae 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -39,7 +39,7 @@
         "android.security.maintenance-rust",
         "android.security.metrics-rust",
         "android.security.remoteprovisioning-rust",
-        "android.system.keystore2-V2-rust",
+        "android.system.keystore2-V1-rust",
         "libanyhow",
         "libbinder_rs",
         "libkeystore2_aaid-rust",