commit 1a18d0530e78c6f185bddbb343310629c6c09bd8
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jan 16 20:50:18 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 16 20:50:18 2025 -0800
tree d8777df26c2aaed6483525380d4bc480f21e59db
parent b197a513ee48e43393be96dac713d62cd2ac57ff
parent 09c52ca4be68141c2948492bc5ed10cc6088da87

Merge "libsnapshot: Set compile_multilib to "first"" into main

fs_mgr/libsnapshot/Android.bp

diff --git a/fs_mgr/libsnapshot/Android.bp b/fs_mgr/libsnapshot/Android.bp
index b5b976a..af1991a 100644
--- a/fs_mgr/libsnapshot/Android.bp
+++ b/fs_mgr/libsnapshot/Android.bp
@@ -308,17 +308,15 @@
         "vts",
         "general-tests",
     ],
-    compile_multilib: "both",
-    multilib: {
-        lib32: {
-            suffix: "32",
-        },
-        lib64: {
-            suffix: "64",
-        },
-    },
+    compile_multilib: "first",
     test_options: {
         min_shipping_api_level: 30,
+        test_runner_options: [
+            {
+                name: "force-no-test-error",
+                value: "false",
+            },
+        ],
     },
 }