From 95dbe442b2abb89017afd52c6e913fe9e7b200f1 Mon Sep 17 00:00:00 2001 From: Jeongik Cha Date: Wed, 17 Feb 2021 12:30:56 +0900 Subject: [PATCH] Specify version for aidl_interface explicitly Bug: 150578172 Test: m Change-Id: I8ccf9c8d08ad7131c77d316bf36fb515421d3ae1 --- security/keymint/aidl/default/Android.bp | 6 +++--- security/keymint/aidl/vts/functional/Android.bp | 2 +- security/keymint/support/Android.bp | 2 +- security/secureclock/aidl/vts/functional/Android.bp | 4 ++-- security/sharedsecret/aidl/vts/functional/Android.bp | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/security/keymint/aidl/default/Android.bp b/security/keymint/aidl/default/Android.bp index e9f3be0a69..e160548931 100644 --- a/security/keymint/aidl/default/Android.bp +++ b/security/keymint/aidl/default/Android.bp @@ -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", diff --git a/security/keymint/aidl/vts/functional/Android.bp b/security/keymint/aidl/vts/functional/Android.bp index 70f0b8a457..13deaca3a1 100644 --- a/security/keymint/aidl/vts/functional/Android.bp +++ b/security/keymint/aidl/vts/functional/Android.bp @@ -83,7 +83,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", diff --git a/security/keymint/support/Android.bp b/security/keymint/support/Android.bp index efdff2bdfc..02558745d5 100644 --- a/security/keymint/support/Android.bp +++ b/security/keymint/support/Android.bp @@ -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", ], } diff --git a/security/secureclock/aidl/vts/functional/Android.bp b/security/secureclock/aidl/vts/functional/Android.bp index 30244eb137..1619eab235 100644 --- a/security/secureclock/aidl/vts/functional/Android.bp +++ b/security/secureclock/aidl/vts/functional/Android.bp @@ -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", diff --git a/security/sharedsecret/aidl/vts/functional/Android.bp b/security/sharedsecret/aidl/vts/functional/Android.bp index 56ab317cf2..76bf7ff762 100644 --- a/security/sharedsecret/aidl/vts/functional/Android.bp +++ b/security/sharedsecret/aidl/vts/functional/Android.bp @@ -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",