Bump Identity and KM AIDL API versions am: f48a2a7bbf

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2205679

Change-Id: Ic9cac9d245efcefd50a3b871351593bec1565856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tri Vo
2022-10-20 03:14:59 +00:00
committed by Automerger Merge Worker
5 changed files with 13 additions and 13 deletions

View File

@@ -352,7 +352,7 @@
</hal> </hal>
<hal format="aidl" optional="true"> <hal format="aidl" optional="true">
<name>android.hardware.identity</name> <name>android.hardware.identity</name>
<version>1-4</version> <version>1-5</version>
<interface> <interface>
<name>IIdentityCredentialStore</name> <name>IIdentityCredentialStore</name>
<instance>default</instance> <instance>default</instance>
@@ -399,7 +399,7 @@
</hal> </hal>
<hal format="aidl" optional="true"> <hal format="aidl" optional="true">
<name>android.hardware.security.keymint</name> <name>android.hardware.security.keymint</name>
<version>1-2</version> <version>1-3</version>
<interface> <interface>
<name>IKeyMintDevice</name> <name>IKeyMintDevice</name>
<instance>default</instance> <instance>default</instance>
@@ -408,7 +408,7 @@
</hal> </hal>
<hal format="aidl" optional="true"> <hal format="aidl" optional="true">
<name>android.hardware.security.keymint</name> <name>android.hardware.security.keymint</name>
<version>1-2</version> <version>1-3</version>
<interface> <interface>
<name>IRemotelyProvisionedComponent</name> <name>IRemotelyProvisionedComponent</name>
<instance>default</instance> <instance>default</instance>

View File

@@ -20,7 +20,7 @@ aidl_interface {
name: "android.hardware.confirmationui", name: "android.hardware.confirmationui",
vendor_available: true, vendor_available: true,
imports: [ imports: [
"android.hardware.security.keymint-V2", "android.hardware.security.keymint-V3",
], ],
srcs: ["android/hardware/confirmationui/*.aidl"], srcs: ["android/hardware/confirmationui/*.aidl"],
stability: "vintf", stability: "vintf",

View File

@@ -11,7 +11,7 @@ aidl_interface {
name: "android.hardware.gatekeeper", name: "android.hardware.gatekeeper",
vendor_available: true, vendor_available: true,
imports: [ imports: [
"android.hardware.security.keymint-V2", "android.hardware.security.keymint-V3",
], ],
srcs: ["android/hardware/gatekeeper/*.aidl"], srcs: ["android/hardware/gatekeeper/*.aidl"],
stability: "vintf", stability: "vintf",

View File

@@ -14,7 +14,7 @@ aidl_interface {
"android/hardware/identity/*.aidl", "android/hardware/identity/*.aidl",
], ],
imports: [ imports: [
"android.hardware.keymaster", "android.hardware.keymaster-V3",
"android.hardware.security.keymint", "android.hardware.security.keymint",
], ],
stability: "vintf", stability: "vintf",
@@ -66,20 +66,20 @@ aidl_interface {
cc_defaults { cc_defaults {
name: "identity_use_latest_hal_aidl_ndk_static", name: "identity_use_latest_hal_aidl_ndk_static",
static_libs: [ static_libs: [
"android.hardware.identity-V4-ndk", "android.hardware.identity-V5-ndk",
], ],
} }
cc_defaults { cc_defaults {
name: "identity_use_latest_hal_aidl_ndk_shared", name: "identity_use_latest_hal_aidl_ndk_shared",
shared_libs: [ shared_libs: [
"android.hardware.identity-V4-ndk", "android.hardware.identity-V5-ndk",
], ],
} }
cc_defaults { cc_defaults {
name: "identity_use_latest_hal_aidl_cpp_static", name: "identity_use_latest_hal_aidl_cpp_static",
static_libs: [ static_libs: [
"android.hardware.identity-V4-cpp", "android.hardware.identity-V5-cpp",
], ],
} }

View File

@@ -52,21 +52,21 @@ aidl_interface {
cc_defaults { cc_defaults {
name: "keymint_use_latest_hal_aidl_ndk_static", name: "keymint_use_latest_hal_aidl_ndk_static",
static_libs: [ static_libs: [
"android.hardware.security.keymint-V2-ndk", "android.hardware.security.keymint-V3-ndk",
], ],
} }
cc_defaults { cc_defaults {
name: "keymint_use_latest_hal_aidl_ndk_shared", name: "keymint_use_latest_hal_aidl_ndk_shared",
shared_libs: [ shared_libs: [
"android.hardware.security.keymint-V2-ndk", "android.hardware.security.keymint-V3-ndk",
], ],
} }
cc_defaults { cc_defaults {
name: "keymint_use_latest_hal_aidl_cpp_static", name: "keymint_use_latest_hal_aidl_cpp_static",
static_libs: [ static_libs: [
"android.hardware.security.keymint-V2-cpp", "android.hardware.security.keymint-V3-cpp",
], ],
} }
@@ -76,6 +76,6 @@ cc_defaults {
rust_defaults { rust_defaults {
name: "keymint_use_latest_hal_aidl_rust", name: "keymint_use_latest_hal_aidl_rust",
rustlibs: [ rustlibs: [
"android.hardware.security.keymint-V2-rust", "android.hardware.security.keymint-V3-rust",
], ],
} }