From 1486987d348e30190bc86342ecbb51dc16666501 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 27 Jul 2021 12:19:00 +0900 Subject: [PATCH] Remove ndk_platform backend. Use the ndk backend. The ndk_platform backend will soon be deprecated because the ndk backend can serve the same purpose. This is to eliminate the confusion about having two variants (ndk and ndk_platform) for the same 'ndk' backend. Bug: 161456198 Test: m Change-Id: I7e60ee840fd64f9e36bafa8baea19daab9c15cea --- gatekeeperd/Android.bp | 4 ++-- trusty/keymaster/Android.bp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gatekeeperd/Android.bp b/gatekeeperd/Android.bp index 95e814b6a..a7f0c0ee4 100644 --- a/gatekeeperd/Android.bp +++ b/gatekeeperd/Android.bp @@ -43,8 +43,8 @@ cc_binary { "libhidlbase", "android.hardware.gatekeeper@1.0", "libgatekeeper_aidl", - "android.hardware.security.keymint-V1-ndk_platform", - "android.security.authorization-ndk_platform", + "android.hardware.security.keymint-V1-ndk", + "android.security.authorization-ndk", ], static_libs: ["libscrypt_static"], diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp index ff6460de8..155363c0a 100644 --- a/trusty/keymaster/Android.bp +++ b/trusty/keymaster/Android.bp @@ -106,9 +106,9 @@ cc_binary { "keymint/service.cpp", ], shared_libs: [ - "android.hardware.security.keymint-V1-ndk_platform", - "android.hardware.security.secureclock-V1-ndk_platform", - "android.hardware.security.sharedsecret-V1-ndk_platform", + "android.hardware.security.keymint-V1-ndk", + "android.hardware.security.secureclock-V1-ndk", + "android.hardware.security.sharedsecret-V1-ndk", "lib_android_keymaster_keymint_utils", "libbase", "libbinder_ndk",