summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Anderson <dvander@google.com>2023-02-09 21:36:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-09 21:36:10 +0000
commit689290a182c06585730bb142fdd355b3e22746ca (patch)
tree7a8e153f6988f95aecf58c861e04aca304291866
parentd5e026e1af9a3e0d28793cbaa33b28bee953501d (diff)
parentcb6ea9edb43c05d6a3e99603914084a9fe9b4ac5 (diff)
downloadcore-689290a182c06585730bb142fdd355b3e22746ca.tar.gz
Merge "libsnapshot: Disable 32-bit VTS tests on 64-bit systems." into android13-tests-dev am: cb6ea9edb4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2427052 Change-Id: Ieacfa1efbef66b0d73da0947dda3f1d5bc6a1c0a 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 {