commit 2b194b378e188d42d992760a211fd6f059b14c6c
author Sean Hong <seanhong@google.com> Tue Aug 16 01:46:36 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 16 01:46:36 2022 +0000
tree 64b710df8275c1575470d4240c60de1e89c947f0
parent de5b6eb3c3972f2b4e60e1a9fc8c2666a9def100
parent 4ccf651c01a88415d35065e38cc101b3087d17f6

Merge changes I20b44558,Ie26894e0,I4bb282e8,Ib6fa7330

* changes:
  Add seat headrest properties to DefaultProperties.json for CTS tests
  Add seat lumbar properties to DefaultProperties.json for CTS tests
  Add seat tilt properties to DefaultProperties.json for CTS tests
  Add seat depth properties to the DefaultProperties.json for CTS tests

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