commit f001a413ce1bbfa7d2b5521a888614314631bf46
author Seth Moore <sethmo@google.com> Fri Nov 04 16:40:46 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 04 16:40:57 2022 +0000
tree b12d21b8c1a707e5a96b95105cfafccf3ba8a263
parent 0f44f2644d386080524952f8ceeafc2e0b793cd3

Revert "Update the RKP aidl dependency"

Revert "Add dependency on newly-split RKP HAL"

Revert "Add dependencies on newly-split RKP HAL"

Revert "Add dependency on split out RKP HAL"

Revert submission 20364235-split-rkp-aidl

Reason for revert: Build break in android.hardware.identity-api
Reverted Changes:
Ib86454bbb:Update dependencies on HAL types moved from keymin...
I501c967e2:Add dependencies on newly-split RKP HAL
I08560f9af:Add dependency on split out RKP HAL
I87133e385:Add dependency on split out RKP HAL
Ia13374cbc:Add dependency on split out RKP HAL
I72bc1774c:Add dependency on newly-split RKP HAL
I71ac265e3:Add dependency on newly-split RKP HAL
Ie0e17bb2c:Update the RKP aidl dependency
I5d24f47ce:Update README and CHANGELOG for RKP
I4b2498dd1:Split rkp from keymint.
I266009d75:Add dependency on newly-split rkp HAL

Change-Id: I0c70c1086773b31ae2634bacba6e371aa2dc09bb

identity/aidl/Android.bp

diff --git a/identity/aidl/Android.bp b/identity/aidl/Android.bp
index e2f9d0b..9f2e498 100644
--- a/identity/aidl/Android.bp
+++ b/identity/aidl/Android.bp
@@ -15,7 +15,7 @@
     ],
     imports: [
         "android.hardware.keymaster-V3",
-        "android.hardware.security.rkp-V3",
+        "android.hardware.security.keymint-V3",
     ],
     stability: "vintf",
     backend: {
@@ -31,28 +31,28 @@
             version: "1",
             imports: [
                 "android.hardware.keymaster-V3",
-                "android.hardware.security.rkp-V1",
+                "android.hardware.security.keymint-V1",
             ],
         },
         {
             version: "2",
             imports: [
                 "android.hardware.keymaster-V3",
-                "android.hardware.security.rkp-V1",
+                "android.hardware.security.keymint-V1",
             ],
         },
         {
             version: "3",
             imports: [
                 "android.hardware.keymaster-V3",
-                "android.hardware.security.rkp-V1",
+                "android.hardware.security.keymint-V1",
             ],
         },
         {
             version: "4",
             imports: [
                 "android.hardware.keymaster-V3",
-                "android.hardware.security.rkp-V3",
+                "android.hardware.security.keymint-V2",
             ],
         },