commit 050a7ed6ecc05ddfd5010dbe7e5004b25995551e
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 07 18:47:58 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 07 18:47:58 2021 +0000
tree 6a803e25b97b003e027e9b1cd91e0444a18f1d76
parent ccd2d0687c92bbf038de99bd2a3e9e82cab1afd1
parent 190b5fb47a36ce0914e5c99aa19daa16ddb3f392

Merge "Depend on Keystore2 AIDL via default" am: b9f8c322c7 am: 64a5600c83 am: 190b5fb47a

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

Change-Id: I3a986fe14e69b6f94f86962574198d6b3dc358da

Android.bp

diff --git a/Android.bp b/Android.bp
index d9d6e12..1550264 100644
--- a/Android.bp
+++ b/Android.bp
@@ -107,6 +107,7 @@
     defaults: [
         "vold_default_flags",
         "vold_default_libs",
+        "keystore2_use_latest_aidl_ndk_shared",
     ],
 
     srcs: [
@@ -164,7 +165,6 @@
     shared_libs: [
         "android.hardware.health.storage@1.0",
         "android.hardware.health.storage-V1-ndk",
-        "android.system.keystore2-V1-ndk",
         "android.security.maintenance-ndk",
         "libbinder_ndk",
         "libkeymint_support",
@@ -180,6 +180,7 @@
     defaults: [
         "vold_default_flags",
         "vold_default_libs",
+        "keystore2_use_latest_aidl_ndk_shared",
     ],
 
     srcs: ["main.cpp"],
@@ -197,7 +198,6 @@
     shared_libs: [
         "android.hardware.health.storage@1.0",
         "android.hardware.health.storage-V1-ndk",
-        "android.system.keystore2-V1-ndk",
         "android.security.maintenance-ndk",
         "libbinder_ndk",
         "libkeymint_support",