From 2317bbad07a5dddac480fba6db2b9d0210d566cd Mon Sep 17 00:00:00 2001
From: Akilesh Kailash <akailash@google.com>
Date: Wed, 24 Jul 2024 11:27:11 -0700
Subject: [PATCH] libsnapshot: compile tests for both 32 and 64 bit

Bug: 352605053
Test: th
Change-Id: I0566e237d1151c705d61623be4b496d73b9ec3ea
Signed-off-by: Akilesh Kailash <akailash@google.com>
---
 fs_mgr/libsnapshot/Android.bp           | 16 +++++++++-------
 fs_mgr/libsnapshot/snapuserd/Android.bp | 12 +++++++++++-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/fs_mgr/libsnapshot/Android.bp b/fs_mgr/libsnapshot/Android.bp
index cc6db358b..0a9a95c57 100644
--- a/fs_mgr/libsnapshot/Android.bp
+++ b/fs_mgr/libsnapshot/Android.bp
@@ -281,9 +281,17 @@ cc_defaults {
     header_libs: [
         "libstorage_literals_headers",
     ],
+    compile_multilib: "both",
+    multilib: {
+        lib32: {
+            suffix: "32",
+        },
+        lib64: {
+            suffix: "64",
+        },
+    },
     auto_gen_config: true,
     require_root: true,
-    compile_multilib: "first",
 }
 
 cc_test {
@@ -316,12 +324,6 @@ cc_test {
     test_options: {
         // Legacy VAB launched in Android R.
         min_shipping_api_level: 30,
-        test_runner_options: [
-            {
-                name: "force-no-test-error",
-                value: "false",
-            },
-        ],
     },
 }
 
diff --git a/fs_mgr/libsnapshot/snapuserd/Android.bp b/fs_mgr/libsnapshot/snapuserd/Android.bp
index b3a7e8cf1..43be0987b 100644
--- a/fs_mgr/libsnapshot/snapuserd/Android.bp
+++ b/fs_mgr/libsnapshot/snapuserd/Android.bp
@@ -238,9 +238,19 @@ cc_defaults {
     test_options: {
         min_shipping_api_level: 30,
     },
+
+    compile_multilib: "both",
+    multilib: {
+        lib32: {
+            suffix: "32",
+        },
+        lib64: {
+            suffix: "64",
+        },
+    },
+
     auto_gen_config: true,
     require_root: true,
-    compile_multilib: "first",
 }
 
 cc_test {