commit a2446c1ae3b3814cb97018b5b58b7e6e23583ad5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jul 19 19:00:52 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 19 19:00:52 2024 +0000
tree c47d02aaad10a4853c51e8404d618a0b8434deff
parent 18c4b771a8af58411b4852a0ef8a49f7dcc36453
parent e9213778d4da76e0cc01a0b917a7b23495ac4f98

Merge "Use compile_multilib: "both" for MTS" into main am: 78931a3c91 am: e9213778d4

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3184619

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

tests/mts/Android.bp

diff --git a/tests/mts/Android.bp b/tests/mts/Android.bp
index c118d0a..9d158fd 100644
--- a/tests/mts/Android.bp
+++ b/tests/mts/Android.bp
@@ -40,6 +40,6 @@
     srcs: [
         "bpf_existence_test.cpp",
     ],
-    compile_multilib: "first",
+    compile_multilib: "both",
     min_sdk_version: "30", // Ensure test runs on R and above.
 }

tests/native/connectivity_native_test/Android.bp

diff --git a/tests/native/connectivity_native_test/Android.bp b/tests/native/connectivity_native_test/Android.bp
index c5088c6..ab2f28c 100644
--- a/tests/native/connectivity_native_test/Android.bp
+++ b/tests/native/connectivity_native_test/Android.bp
@@ -32,7 +32,7 @@
         "libmodules-utils-build",
         "libutils",
     ],
-    compile_multilib: "first",
+    compile_multilib: "both",
 }
 
 filegroup {