Merge "Revert "libsnapshot: compile tests for both 32 and 64 bit"" into main

This commit is contained in:
Treehugger Robot 2024-08-08 06:50:11 +00:00 committed by Gerrit Code Review
commit 9da55b8cf7
2 changed files with 8 additions and 20 deletions

View file

@ -281,17 +281,9 @@ 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 {
@ -324,6 +316,12 @@ 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",
},
],
},
}

View file

@ -238,19 +238,9 @@ 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 {