Merge "Specify version for aidl_interface explicitly" am: cb2ba40919

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6e93784d48dcb7ebfab027f452e7e0fc09ccfd6
This commit is contained in:
Treehugger Robot 2021-02-18 15:17:10 +00:00 committed by Automerger Merge Worker
commit 2e0eb52a5b
5 changed files with 9 additions and 9 deletions

View file

@ -14,8 +14,8 @@ cc_binary {
],
shared_libs: [
"android.hardware.security.keymint-V1-ndk_platform",
"android.hardware.security.sharedsecret-unstable-ndk_platform",
"android.hardware.security.secureclock-unstable-ndk_platform",
"android.hardware.security.sharedsecret-V1-ndk_platform",
"android.hardware.security.secureclock-V1-ndk_platform",
"libbase",
"libbinder_ndk",
"libcppbor_external",
@ -39,7 +39,7 @@ cc_library {
"libkeymint_remote_prov_support",
],
shared_libs: [
"android.hardware.security.keymint-unstable-ndk_platform",
"android.hardware.security.keymint-V1-ndk_platform",
"libbinder_ndk",
"libcppbor_external",
"libcppcose",

View file

@ -84,7 +84,7 @@ cc_test {
"libpuresoftkeymasterdevice",
],
static_libs: [
"android.hardware.security.keymint-unstable-ndk_platform",
"android.hardware.security.keymint-V1-ndk_platform",
"libcppcose",
"libgmock_ndk",
"libremote_provisioner",

View file

@ -71,6 +71,6 @@ cc_library {
],
static_libs: [
// TODO(swillden): Remove keymint NDK
"android.hardware.security.keymint-unstable-ndk_platform",
"android.hardware.security.keymint-V1-ndk_platform",
],
}

View file

@ -33,8 +33,8 @@ cc_test {
"libkeymint",
],
static_libs: [
"android.hardware.security.keymint-unstable-ndk_platform",
"android.hardware.security.secureclock-unstable-ndk_platform",
"android.hardware.security.keymint-V1-ndk_platform",
"android.hardware.security.secureclock-V1-ndk_platform",
],
test_suites: [
"general-tests",

View file

@ -33,8 +33,8 @@ cc_test {
"libkeymint",
],
static_libs: [
"android.hardware.security.keymint-unstable-ndk_platform",
"android.hardware.security.sharedsecret-unstable-ndk_platform",
"android.hardware.security.keymint-V1-ndk_platform",
"android.hardware.security.sharedsecret-V1-ndk_platform",
],
test_suites: [
"general-tests",