commit 4cc876dd1c91b25034ab36fffd13e8157c322bf9
author Jiyong Park <jiyong@google.com> Wed Jul 28 14:26:37 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 28 14:26:37 2021 +0000
tree 7a7c06af7d42a534f6260390f6910150e833ff08
parent 29704321d696db9e1e460b5d379472efe565f331
parent d44e0170ac43c446d4bd62326a21493bd5f9acc5

Merge "Remove ndk_platform backend. Use the ndk backend."

compos/compos_key_cmd/Android.bp

diff --git a/compos/compos_key_cmd/Android.bp b/compos/compos_key_cmd/Android.bp
index 00d1035..1d889c6 100644
--- a/compos/compos_key_cmd/Android.bp
+++ b/compos/compos_key_cmd/Android.bp
@@ -12,7 +12,7 @@
     ],
 
     shared_libs: [
-        "compos_aidl_interface-ndk_platform",
+        "compos_aidl_interface-ndk",
         "libbase",
         "libbinder_rpc_unstable",
         "libbinder_ndk",

microdroid/keymint/Android.bp

diff --git a/microdroid/keymint/Android.bp b/microdroid/keymint/Android.bp
index 6d651b9..a0bbaf4 100644
--- a/microdroid/keymint/Android.bp
+++ b/microdroid/keymint/Android.bp
@@ -15,7 +15,7 @@
         "-Wextra",
     ],
     shared_libs: [
-        "android.hardware.security.keymint-V1-ndk_platform",
+        "android.hardware.security.keymint-V1-ndk",
         "lib_android_keymaster_keymint_utils",
         "libbase",
         "libbinder_ndk",

tests/testapk/Android.bp

diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index 7332149..f545f8e 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -18,7 +18,7 @@
     name: "MicrodroidTestNativeLib",
     srcs: ["src/native/testbinary.cpp"],
     shared_libs: [
-        "android.system.keystore2-V1-ndk_platform",
+        "android.system.keystore2-V1-ndk",
         "libbase",
         "libbinder_ndk",
         "MicrodroidTestNativeLibSub",