From 46afe63eaf81eb5cd613a29b5081b5f9468d29ed Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 12 Aug 2022 13:40:26 +0900 Subject: [PATCH] Build libwifi-hal-* modules only for the first arch Previously, the build rules assumed that the target supports both 64 and 32 bit architectures, which isn't true for 32-bit-only targets. That caused build breakage on such targets. Fixing that by building the modules only for the first architecture (64 on 64-only or 64/32 target, and 32 on 32-only target). Bug: 241916304 Test: build the 32-bit-only target Merged-In: I5353ab1561622eae12e2dff87eb0f17b47c3773d Change-Id: I5353ab1561622eae12e2dff87eb0f17b47c3773d (cherry picked from commit 3ab5c9010431c557c22eee5470b8e0580722d2b6) --- wifi/1.6/default/Android.bp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wifi/1.6/default/Android.bp b/wifi/1.6/default/Android.bp index 0ac6412544..a132deed59 100644 --- a/wifi/1.6/default/Android.bp +++ b/wifi/1.6/default/Android.bp @@ -63,6 +63,7 @@ cc_library_static { 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_binary { cc_test { name: "android.hardware.wifi@1.0-service-tests", proprietary: true, + compile_multilib: "first", cppflags: [ "-Wall", "-Werror",