Merge "libsnapshot: compile tests for both 32 and 64 bit" into main am: 172f412b25
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3236906
Change-Id: Ie92e6cc1ad5f0a05b5760f9ffbf4c0c5c6c14e61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fs_mgr/libsnapshot/Android.bp b/fs_mgr/libsnapshot/Android.bp
index 4828c4c..f98b2b5 100644
--- a/fs_mgr/libsnapshot/Android.bp
+++ b/fs_mgr/libsnapshot/Android.bp
@@ -285,7 +285,6 @@
],
auto_gen_config: true,
require_root: true,
- compile_multilib: "first",
}
cc_test {
@@ -298,6 +297,15 @@
"vts",
"general-tests",
],
+ compile_multilib: "both",
+ multilib: {
+ lib32: {
+ suffix: "32",
+ },
+ lib64: {
+ suffix: "64",
+ },
+ },
test_options: {
min_shipping_api_level: 30,
},
@@ -315,6 +323,7 @@
test_suites: [
"general-tests",
],
+ compile_multilib: "64",
test_options: {
// Legacy VAB launched in Android R.
min_shipping_api_level: 30,
diff --git a/fs_mgr/libsnapshot/snapuserd/Android.bp b/fs_mgr/libsnapshot/snapuserd/Android.bp
index f32cdbb..298fd9f 100644
--- a/fs_mgr/libsnapshot/snapuserd/Android.bp
+++ b/fs_mgr/libsnapshot/snapuserd/Android.bp
@@ -239,9 +239,19 @@
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 {