commit e711205410c4f75ff80cc68bc19746027b9b5122
author Treehugger Robot <treehugger-gerrit@google.com> Mon Aug 22 03:15:39 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 22 03:15:39 2022 +0000
tree e36b22d486d1107f73891ddfe6c1f0f15c327f84
parent a12712afdce08b646705cdb855873a511ec2e85f
parent 4cb903bdcbdaefd061ebf3f66f6e734328ea04aa

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

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

Change-Id: Ic839bd9b043d7fa193086c44d7e08c5a32e9a5d4
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",