summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Anderson <dvander@google.com>2023-02-09 23:14:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-09 23:14:20 +0000
commitd73b4aa2f9782e8151d31593576592d8da0da570 (patch)
treed29603b9a4427e5b4d3a68a904b6488e919b9bd0
parent67481a676fa8b04fb0ed926f87320db68b38b71e (diff)
parent689290a182c06585730bb142fdd355b3e22746ca (diff)
downloadcore-d73b4aa2f9782e8151d31593576592d8da0da570.tar.gz
Merge "libsnapshot: Disable 32-bit VTS tests on 64-bit systems." into android13-tests-dev am: cb6ea9edb4 am: 689290a182
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2427052 Change-Id: I65e074a2336c2bd51d68a6618c62e60abe0bdd82 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 {