commit d388f14169fa298f182aa0d84d0f442b240e13e8
author Treehugger Robot <treehugger-gerrit@google.com> Mon Aug 22 03:33:02 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 22 03:33:02 2022 +0000
tree 096d20999d5c2fcf9e5bcf82e823d49913afa626
parent 3b5f866a5c1b9d9c0be9baad040f7a96506b3c39
parent e711205410c4f75ff80cc68bc19746027b9b5122

Merge changes from topic "cp-libwifihal-soong" am: 08f3ea9e97 am: 4cb903bdcb am: e711205410

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2185352

Change-Id: Ib3ae27f66c49dfebddc53c1403c9d13e70c87ef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

wifi/1.6/default/Android.bp

diff --git a/wifi/1.6/default/Android.bp b/wifi/1.6/default/Android.bp
index 0ac6412..a132dee 100644
--- a/wifi/1.6/default/Android.bp
+++ b/wifi/1.6/default/Android.bp
@@ -63,6 +63,7 @@
     name: "android.hardware.wifi@1.0-service-lib",
     defaults: ["android.hardware.wifi@1.0-service-cppflags-defaults"],
     proprietary: true,
+    compile_multilib: "first",
     cppflags: [
         "-Wall",
         "-Werror",
@@ -183,6 +184,7 @@
 cc_test {
     name: "android.hardware.wifi@1.0-service-tests",
     proprietary: true,
+    compile_multilib: "first",
     cppflags: [
         "-Wall",
         "-Werror",