commit 4babbc78d5ae4e93a4aa2609e04a0efc78832178
author David Drysdale <drysdale@google.com> Mon Nov 22 18:19:40 2021 +0000
committer David Drysdale <drysdale@google.com> Wed Dec 01 09:56:48 2021 +0000
tree 1043534998e783ac88a8928954e5cd53b0a2de6f
parent bddb449182e018678cfe483ff38869c56bef0116

Depend on Keystore2 AIDL via default

This allows for easier bumping of the KeyMint/Keystore2 version level.

At the moment this change should have no effect: the same dependency
is used, just reached via a default rather than explicitly.

However, when the Keystore2 version increases in the near future, using
this default should mean that no change is needed here: the default
definition will change to -V2 and this will be referenced here.

Test: TreeHugger
Change-Id: I7cec2cd8fac137e5ac7e95db06e738e94a3cc567

Android.bp

diff --git a/Android.bp b/Android.bp
index 4750d1a..e5d5e8f 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"],
@@ -196,7 +197,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",