From ccbb5d8a61401567605e4bc297a7a2b46d90bb22 Mon Sep 17 00:00:00 2001 From: Seth Moore Date: Fri, 4 Nov 2022 16:40:46 +0000 Subject: [PATCH] Revert "Split rkp from keymint." 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: Ic0a1c38d36a24cc2206d078e1486d51baef0e4c3 --- .../android.hardware.security.keymint/1/.hash | 1 - .../hardware/security/keymint/DeviceInfo.aidl | 0 .../IRemotelyProvisionedComponent.aidl | 0 .../security/keymint/MacedPublicKey.aidl | 0 .../security/keymint/ProtectedData.aidl | 0 .../security/keymint/RpcHardwareInfo.aidl | 0 .../android.hardware.security.keymint/2/.hash | 1 - .../hardware/security/keymint/DeviceInfo.aidl | 0 .../IRemotelyProvisionedComponent.aidl | 0 .../security/keymint/MacedPublicKey.aidl | 0 .../security/keymint/ProtectedData.aidl | 0 .../security/keymint/RpcHardwareInfo.aidl | 0 .../hardware/security/keymint/DeviceInfo.aidl | 0 .../IRemotelyProvisionedComponent.aidl | 0 .../security/keymint/MacedPublicKey.aidl | 0 .../security/keymint/ProtectedData.aidl | 0 .../security/keymint/RpcHardwareInfo.aidl | 0 .../hardware/security/keymint/DeviceInfo.aidl | 0 .../IRemotelyProvisionedComponent.aidl | 0 .../security/keymint/MacedPublicKey.aidl | 0 .../security/keymint/ProtectedData.aidl | 0 .../security/keymint/RpcHardwareInfo.aidl | 0 security/rkp/aidl/Android.bp | 37 ------------------- .../android.hardware.security.rkp/1/.hash | 1 - .../android.hardware.security.rkp/2/.hash | 1 - 25 files changed, 41 deletions(-) rename security/{rkp/aidl/aidl_api/android.hardware.security.rkp => keymint/aidl/aidl_api/android.hardware.security.keymint}/1/android/hardware/security/keymint/DeviceInfo.aidl (100%) rename security/{rkp/aidl/aidl_api/android.hardware.security.rkp => keymint/aidl/aidl_api/android.hardware.security.keymint}/1/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl (100%) rename security/{rkp/aidl/aidl_api/android.hardware.security.rkp => keymint/aidl/aidl_api/android.hardware.security.keymint}/1/android/hardware/security/keymint/MacedPublicKey.aidl (100%) rename security/{rkp/aidl/aidl_api/android.hardware.security.rkp => keymint/aidl/aidl_api/android.hardware.security.keymint}/1/android/hardware/security/keymint/ProtectedData.aidl (100%) rename security/{rkp/aidl/aidl_api/android.hardware.security.rkp => keymint/aidl/aidl_api/android.hardware.security.keymint}/1/android/hardware/security/keymint/RpcHardwareInfo.aidl (100%) rename security/{rkp/aidl/aidl_api/android.hardware.security.rkp => keymint/aidl/aidl_api/android.hardware.security.keymint}/2/android/hardware/security/keymint/DeviceInfo.aidl (100%) rename security/{rkp/aidl/aidl_api/android.hardware.security.rkp => keymint/aidl/aidl_api/android.hardware.security.keymint}/2/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl (100%) rename security/{rkp/aidl/aidl_api/android.hardware.security.rkp => keymint/aidl/aidl_api/android.hardware.security.keymint}/2/android/hardware/security/keymint/MacedPublicKey.aidl (100%) rename security/{rkp/aidl/aidl_api/android.hardware.security.rkp => keymint/aidl/aidl_api/android.hardware.security.keymint}/2/android/hardware/security/keymint/ProtectedData.aidl (100%) rename security/{rkp/aidl/aidl_api/android.hardware.security.rkp => keymint/aidl/aidl_api/android.hardware.security.keymint}/2/android/hardware/security/keymint/RpcHardwareInfo.aidl (100%) rename security/{rkp/aidl/aidl_api/android.hardware.security.rkp => keymint/aidl/aidl_api/android.hardware.security.keymint}/current/android/hardware/security/keymint/DeviceInfo.aidl (100%) rename security/{rkp/aidl/aidl_api/android.hardware.security.rkp => keymint/aidl/aidl_api/android.hardware.security.keymint}/current/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl (100%) rename security/{rkp/aidl/aidl_api/android.hardware.security.rkp => keymint/aidl/aidl_api/android.hardware.security.keymint}/current/android/hardware/security/keymint/MacedPublicKey.aidl (100%) rename security/{rkp/aidl/aidl_api/android.hardware.security.rkp => keymint/aidl/aidl_api/android.hardware.security.keymint}/current/android/hardware/security/keymint/ProtectedData.aidl (100%) rename security/{rkp/aidl/aidl_api/android.hardware.security.rkp => keymint/aidl/aidl_api/android.hardware.security.keymint}/current/android/hardware/security/keymint/RpcHardwareInfo.aidl (100%) rename security/{rkp => keymint}/aidl/android/hardware/security/keymint/DeviceInfo.aidl (100%) rename security/{rkp => keymint}/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl (100%) rename security/{rkp => keymint}/aidl/android/hardware/security/keymint/MacedPublicKey.aidl (100%) rename security/{rkp => keymint}/aidl/android/hardware/security/keymint/ProtectedData.aidl (100%) rename security/{rkp => keymint}/aidl/android/hardware/security/keymint/RpcHardwareInfo.aidl (100%) delete mode 100644 security/rkp/aidl/Android.bp delete mode 100644 security/rkp/aidl/aidl_api/android.hardware.security.rkp/1/.hash delete mode 100644 security/rkp/aidl/aidl_api/android.hardware.security.rkp/2/.hash diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/1/.hash b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/1/.hash index 3a6d4157d1..b712a5231b 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/1/.hash +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/1/.hash @@ -1,2 +1 @@ 976674616001f714f4a4df49ee45f548de828524 -cd862ae2e49b54fc965dc1b99c218eb729c93bb1 diff --git a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/1/android/hardware/security/keymint/DeviceInfo.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/1/android/hardware/security/keymint/DeviceInfo.aidl similarity index 100% rename from security/rkp/aidl/aidl_api/android.hardware.security.rkp/1/android/hardware/security/keymint/DeviceInfo.aidl rename to security/keymint/aidl/aidl_api/android.hardware.security.keymint/1/android/hardware/security/keymint/DeviceInfo.aidl diff --git a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/1/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/1/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl similarity index 100% rename from security/rkp/aidl/aidl_api/android.hardware.security.rkp/1/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl rename to security/keymint/aidl/aidl_api/android.hardware.security.keymint/1/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl diff --git a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/1/android/hardware/security/keymint/MacedPublicKey.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/1/android/hardware/security/keymint/MacedPublicKey.aidl similarity index 100% rename from security/rkp/aidl/aidl_api/android.hardware.security.rkp/1/android/hardware/security/keymint/MacedPublicKey.aidl rename to security/keymint/aidl/aidl_api/android.hardware.security.keymint/1/android/hardware/security/keymint/MacedPublicKey.aidl diff --git a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/1/android/hardware/security/keymint/ProtectedData.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/1/android/hardware/security/keymint/ProtectedData.aidl similarity index 100% rename from security/rkp/aidl/aidl_api/android.hardware.security.rkp/1/android/hardware/security/keymint/ProtectedData.aidl rename to security/keymint/aidl/aidl_api/android.hardware.security.keymint/1/android/hardware/security/keymint/ProtectedData.aidl diff --git a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/1/android/hardware/security/keymint/RpcHardwareInfo.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/1/android/hardware/security/keymint/RpcHardwareInfo.aidl similarity index 100% rename from security/rkp/aidl/aidl_api/android.hardware.security.rkp/1/android/hardware/security/keymint/RpcHardwareInfo.aidl rename to security/keymint/aidl/aidl_api/android.hardware.security.keymint/1/android/hardware/security/keymint/RpcHardwareInfo.aidl diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/2/.hash b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/2/.hash index b4c2b78a70..69ba9a6bc5 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/2/.hash +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/2/.hash @@ -1,2 +1 @@ 207c9f218b9b9e4e74ff5232eb16511eca9d7d2e -70c734fbd5cac5b36676d66d8d9aa941967e1e7b diff --git a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/2/android/hardware/security/keymint/DeviceInfo.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/2/android/hardware/security/keymint/DeviceInfo.aidl similarity index 100% rename from security/rkp/aidl/aidl_api/android.hardware.security.rkp/2/android/hardware/security/keymint/DeviceInfo.aidl rename to security/keymint/aidl/aidl_api/android.hardware.security.keymint/2/android/hardware/security/keymint/DeviceInfo.aidl diff --git a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/2/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/2/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl similarity index 100% rename from security/rkp/aidl/aidl_api/android.hardware.security.rkp/2/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl rename to security/keymint/aidl/aidl_api/android.hardware.security.keymint/2/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl diff --git a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/2/android/hardware/security/keymint/MacedPublicKey.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/2/android/hardware/security/keymint/MacedPublicKey.aidl similarity index 100% rename from security/rkp/aidl/aidl_api/android.hardware.security.rkp/2/android/hardware/security/keymint/MacedPublicKey.aidl rename to security/keymint/aidl/aidl_api/android.hardware.security.keymint/2/android/hardware/security/keymint/MacedPublicKey.aidl diff --git a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/2/android/hardware/security/keymint/ProtectedData.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/2/android/hardware/security/keymint/ProtectedData.aidl similarity index 100% rename from security/rkp/aidl/aidl_api/android.hardware.security.rkp/2/android/hardware/security/keymint/ProtectedData.aidl rename to security/keymint/aidl/aidl_api/android.hardware.security.keymint/2/android/hardware/security/keymint/ProtectedData.aidl diff --git a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/2/android/hardware/security/keymint/RpcHardwareInfo.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/2/android/hardware/security/keymint/RpcHardwareInfo.aidl similarity index 100% rename from security/rkp/aidl/aidl_api/android.hardware.security.rkp/2/android/hardware/security/keymint/RpcHardwareInfo.aidl rename to security/keymint/aidl/aidl_api/android.hardware.security.keymint/2/android/hardware/security/keymint/RpcHardwareInfo.aidl diff --git a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/current/android/hardware/security/keymint/DeviceInfo.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/DeviceInfo.aidl similarity index 100% rename from security/rkp/aidl/aidl_api/android.hardware.security.rkp/current/android/hardware/security/keymint/DeviceInfo.aidl rename to security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/DeviceInfo.aidl diff --git a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/current/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl similarity index 100% rename from security/rkp/aidl/aidl_api/android.hardware.security.rkp/current/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl rename to security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl diff --git a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/current/android/hardware/security/keymint/MacedPublicKey.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/MacedPublicKey.aidl similarity index 100% rename from security/rkp/aidl/aidl_api/android.hardware.security.rkp/current/android/hardware/security/keymint/MacedPublicKey.aidl rename to security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/MacedPublicKey.aidl diff --git a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/current/android/hardware/security/keymint/ProtectedData.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/ProtectedData.aidl similarity index 100% rename from security/rkp/aidl/aidl_api/android.hardware.security.rkp/current/android/hardware/security/keymint/ProtectedData.aidl rename to security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/ProtectedData.aidl diff --git a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/current/android/hardware/security/keymint/RpcHardwareInfo.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/RpcHardwareInfo.aidl similarity index 100% rename from security/rkp/aidl/aidl_api/android.hardware.security.rkp/current/android/hardware/security/keymint/RpcHardwareInfo.aidl rename to security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/RpcHardwareInfo.aidl diff --git a/security/rkp/aidl/android/hardware/security/keymint/DeviceInfo.aidl b/security/keymint/aidl/android/hardware/security/keymint/DeviceInfo.aidl similarity index 100% rename from security/rkp/aidl/android/hardware/security/keymint/DeviceInfo.aidl rename to security/keymint/aidl/android/hardware/security/keymint/DeviceInfo.aidl diff --git a/security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl b/security/keymint/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl similarity index 100% rename from security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl rename to security/keymint/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl diff --git a/security/rkp/aidl/android/hardware/security/keymint/MacedPublicKey.aidl b/security/keymint/aidl/android/hardware/security/keymint/MacedPublicKey.aidl similarity index 100% rename from security/rkp/aidl/android/hardware/security/keymint/MacedPublicKey.aidl rename to security/keymint/aidl/android/hardware/security/keymint/MacedPublicKey.aidl diff --git a/security/rkp/aidl/android/hardware/security/keymint/ProtectedData.aidl b/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl similarity index 100% rename from security/rkp/aidl/android/hardware/security/keymint/ProtectedData.aidl rename to security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl diff --git a/security/rkp/aidl/android/hardware/security/keymint/RpcHardwareInfo.aidl b/security/keymint/aidl/android/hardware/security/keymint/RpcHardwareInfo.aidl similarity index 100% rename from security/rkp/aidl/android/hardware/security/keymint/RpcHardwareInfo.aidl rename to security/keymint/aidl/android/hardware/security/keymint/RpcHardwareInfo.aidl diff --git a/security/rkp/aidl/Android.bp b/security/rkp/aidl/Android.bp deleted file mode 100644 index 4c479f4642..0000000000 --- a/security/rkp/aidl/Android.bp +++ /dev/null @@ -1,37 +0,0 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "hardware_interfaces_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["hardware_interfaces_license"], -} - -aidl_interface { - name: "android.hardware.security.rkp", - vendor_available: true, - srcs: [ - // This HAL was originally part of keymint. - "android/hardware/security/keymint/*.aidl", - - // in the future - // "android/hardware/security/rkp/*.aidl", - ], - stability: "vintf", - backend: { - java: { - min_sdk_version: "33", - }, - rust: { - enabled: true, - }, - }, - versions_with_info: [ - { - version: "1", - }, - { - version: "2", - }, - ], -} diff --git a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/1/.hash b/security/rkp/aidl/aidl_api/android.hardware.security.rkp/1/.hash deleted file mode 100644 index 404553bf36..0000000000 --- a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/1/.hash +++ /dev/null @@ -1 +0,0 @@ -d285480d2e0002adc0ace80edf34aa725679512e diff --git a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/2/.hash b/security/rkp/aidl/aidl_api/android.hardware.security.rkp/2/.hash deleted file mode 100644 index 8700d33656..0000000000 --- a/security/rkp/aidl/aidl_api/android.hardware.security.rkp/2/.hash +++ /dev/null @@ -1 +0,0 @@ -c8d34e56ae0807b61f028019622d8b60a37e0a8b