Merge "Specify version for aidl_interface explicitly"

This commit is contained in:
Treehugger Robot
2021-02-18 12:59:44 +00:00
committed by Gerrit Code Review
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",