summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Anderson <dvander@google.com>2023-02-10 00:39:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-10 00:39:28 +0000
commit4fb1bf6eecff0948d49c280429c2fa6dd58bdee2 (patch)
tree4958c3cb4694c4a7b594daf7fb4a5ac935609341
parenta4fa9e40fd282fe5f0b18c7b25acadb5b25e8d21 (diff)
parenta91a6a51fbc69986a61019f0b980b68f82428445 (diff)
Merge "libsnapshot: Disable 32-bit VTS tests on 64-bit systems." into android13-tests-dev am: cb6ea9edb4 am: 689290a182 am: a91a6a51fb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2427052 Change-Id: I411a7512be6bd8ddd424fd89f9f05ba44972d665 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--fs_mgr/libsnapshot/Android.bp1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs_mgr/libsnapshot/Android.bp b/fs_mgr/libsnapshot/Android.bp
index 6db8f139f..0d8828a47 100644
--- a/fs_mgr/libsnapshot/Android.bp
+++ b/fs_mgr/libsnapshot/Android.bp
@@ -257,6 +257,7 @@ cc_defaults {
},
auto_gen_config: true,
require_root: true,
+ compile_multilib: "first",
}
cc_test {