commit b9f8c322c7b43e396ef6bc58c0cef3349bde82fe
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 07 18:08:13 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 07 18:08:13 2021 +0000
tree 39631820259243f75716e4c6c92701032190e3e5
parent b9f8aefbb9b3222274991f23a3217b491745acc1
parent 4babbc78d5ae4e93a4aa2609e04a0efc78832178

Merge "Depend on Keystore2 AIDL via default"

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",