commit fbc268e40ef0d1cabf054c173dbbcfac122628d5
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 24 02:51:50 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 24 02:51:50 2021 +0000
tree dc6a015831266fcc5fbf03f860113c8e7bcbd3a1
parent 725780809e673c26b4567472c7616bc70c3b96bd
parent 39331f466f15c84888442ed0f63a5aa571bdce2e

Merge "suspend: Add path detail when it fails to read kernel wakesource stats"

suspend/aidl/Android.bp

diff --git a/suspend/aidl/Android.bp b/suspend/aidl/Android.bp
index 7f6846a..5fbacef 100644
--- a/suspend/aidl/Android.bp
+++ b/suspend/aidl/Android.bp
@@ -28,7 +28,7 @@
         ndk: {
             apex_available: [
                 "//apex_available:platform",
-                "com.android.bluetooth.updatable",
+                "com.android.bluetooth",
             ],
         },
         java: {

wifi/keystore/1.0/default/Android.bp

diff --git a/wifi/keystore/1.0/default/Android.bp b/wifi/keystore/1.0/default/Android.bp
index 209b30e..109ae89 100644
--- a/wifi/keystore/1.0/default/Android.bp
+++ b/wifi/keystore/1.0/default/Android.bp
@@ -10,8 +10,10 @@
         "-Wextra",
     ],
     srcs: ["keystore.cpp"],
+    defaults: [
+        "keystore2_use_latest_aidl_ndk_shared",
+    ],
     shared_libs: [
-        "android.system.keystore2-V1-ndk",
         "android.security.legacykeystore-ndk",
         "android.system.wifi.keystore@1.0",
         "libbase",

wifi/keystore/1.0/default/test/Android.bp

diff --git a/wifi/keystore/1.0/default/test/Android.bp b/wifi/keystore/1.0/default/test/Android.bp
index f510063..3d874ea 100644
--- a/wifi/keystore/1.0/default/test/Android.bp
+++ b/wifi/keystore/1.0/default/test/Android.bp
@@ -23,7 +23,11 @@
     srcs: [
         "WifiLegacyKeystoreIntegrationTest.cpp",
     ],
-    defaults: ["VtsHalTargetTestDefaults"],
+    defaults: [
+        "VtsHalTargetTestDefaults",
+        "keymint_use_latest_hal_aidl_ndk_static",
+        "keystore2_use_latest_aidl_ndk_static",
+    ],
     shared_libs: [
         "libbase",
         "liblog",
@@ -36,10 +40,8 @@
     ],
     static_libs: [
         "VtsHalHidlTargetTestBase",
-        "android.hardware.security.keymint-V1-ndk",
         "android.hardware.security.secureclock-V1-ndk",
         "android.security.legacykeystore-ndk",
-        "android.system.keystore2-V1-ndk",
         "android.system.wifi.keystore@1.0",
         "libkeymint_support",
     ],

wifi/keystore/1.0/vts/functional/Android.bp

diff --git a/wifi/keystore/1.0/vts/functional/Android.bp b/wifi/keystore/1.0/vts/functional/Android.bp
index adb9e10..7f13903 100644
--- a/wifi/keystore/1.0/vts/functional/Android.bp
+++ b/wifi/keystore/1.0/vts/functional/Android.bp
@@ -20,7 +20,11 @@
 
 cc_test {
     name: "VtsHalWifiKeystoreV1_0TargetTest",
-    defaults: ["VtsHalTargetTestDefaults"],
+    defaults: [
+        "VtsHalTargetTestDefaults",
+        "keymint_use_latest_hal_aidl_ndk_static",
+        "keystore2_use_latest_aidl_ndk_static",
+    ],
     srcs: [
         "VtsHalWifiKeystoreV1_0TargetTest.cpp",
     ],
@@ -35,8 +39,6 @@
     ],
     static_libs: [
         "VtsHalHidlTargetTestBase",
-        "android.hardware.security.keymint-V1-ndk",
-        "android.system.keystore2-V1-ndk",
         "android.system.wifi.keystore@1.0",
         "libkeymint_support",
     ],