ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Akilesh Kailash 2024-08-30 17:47:23 +00:00 • committed by Gerrit Code Review
commit 172f412b25
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fs_mgr/libsnapshot/Android.bp
View file

@ -285,7 +285,6 @@ cc_defaults {
], ],
auto_gen_config: true, auto_gen_config: true,
require_root: true, require_root: true,
compile_multilib: "first",
} }
cc_test { cc_test {
@ -298,6 +297,15 @@ cc_test {
"vts", "vts",
"general-tests", "general-tests",
], ],
compile_multilib: "both",
multilib: {
lib32: {
suffix: "32",
},
lib64: {
suffix: "64",
},
},
test_options: { test_options: {
min_shipping_api_level: 30, min_shipping_api_level: 30,
}, },
@ -315,6 +323,7 @@ cc_test {
test_suites: [ test_suites: [
"general-tests", "general-tests",
], ],
compile_multilib: "64",
test_options: { test_options: {
// Legacy VAB launched in Android R. // Legacy VAB launched in Android R.
min_shipping_api_level: 30, min_shipping_api_level: 30,

12
fs_mgr/libsnapshot/snapuserd/Android.bp
View file

@ -239,9 +239,19 @@ cc_defaults {
test_options: { test_options: {
min_shipping_api_level: 30, min_shipping_api_level: 30,
}, },
compile_multilib: "both",
multilib: {
lib32: {
suffix: "32",
},
lib64: {
suffix: "64",
},
},
auto_gen_config: true, auto_gen_config: true,
require_root: true, require_root: true,
compile_multilib: "first",
} }
cc_test { cc_test {