commit ff366fab5ffc736a13fc4f3b13489c801f86ddfc
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 28 12:49:02 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 28 12:49:02 2021 +0000
tree aca16470630e55ea3d6286495aad5134390dd5c7
parent 78c9cba6a559af2092b8dd54cf5a9beaecb1cfa4
parent e66b2b4015a462d0709c29847bf1112fcf338ea5

Merge "Remove ndk_platform backend. Use the ndk backend." am: 85705f6c86 am: e66b2b4015

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1778413

Change-Id: I3bf1a2b23581bb543ec1496bb60f5d8052076fce

Android.bp

diff --git a/Android.bp b/Android.bp
index 466ba77..35f74bf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -165,9 +165,9 @@
     },
     shared_libs: [
         "android.hardware.health.storage@1.0",
-        "android.hardware.health.storage-V1-ndk_platform",
-        "android.system.keystore2-V1-ndk_platform",
-        "android.security.maintenance-ndk_platform",
+        "android.hardware.health.storage-V1-ndk",
+        "android.system.keystore2-V1-ndk",
+        "android.security.maintenance-ndk",
         "libbinder_ndk",
         "libkeymint_support",
     ],
@@ -197,9 +197,9 @@
 
     shared_libs: [
         "android.hardware.health.storage@1.0",
-        "android.hardware.health.storage-V1-ndk_platform",
-        "android.system.keystore2-V1-ndk_platform",
-        "android.security.maintenance-ndk_platform",
+        "android.hardware.health.storage-V1-ndk",
+        "android.system.keystore2-V1-ndk",
+        "android.security.maintenance-ndk",
         "libbinder_ndk",
         "libkeymint_support",
     ],