pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "libsnapshot: Don't run legacy tests in VTS." am: c2f3d686e9 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2536971

Change-Id: Ia96079dbe76f5dfad58a4abfbef4b3185935364f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Anderson 2023-04-14 16:00:17 +00:00 committed by Automerger Merge Worker
parent c55077b93a c2f3d686e9
commit 469d1a33c1
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fs_mgr/libsnapshot/Android.bp
View File

@ -252,13 +252,6 @@ cc_defaults {
header_libs: [ header_libs: [
"libstorage_literals_headers", "libstorage_literals_headers",
], ],
test_suites: [
"vts",
"device-tests"
],
test_options: {
min_shipping_api_level: 29,
},
auto_gen_config: true, auto_gen_config: true,
require_root: true, require_root: true,
compile_multilib: "first", compile_multilib: "first",
@ -267,6 +260,13 @@ cc_defaults {
cc_test { cc_test {
name: "vts_libsnapshot_test", name: "vts_libsnapshot_test",
defaults: ["libsnapshot_test_defaults", "libsnapshot_hal_deps"], defaults: ["libsnapshot_test_defaults", "libsnapshot_hal_deps"],
test_suites: [
"vts",
"device-tests"
],
test_options: {
min_shipping_api_level: 30,
},
} }
cc_test { cc_test {
@ -275,6 +275,13 @@ cc_test {
cppflags: [ cppflags: [
"-DLIBSNAPSHOT_TEST_VAB_LEGACY", "-DLIBSNAPSHOT_TEST_VAB_LEGACY",
], ],
test_suites: [
"device-tests"
],
test_options: {
// Legacy VAB launched in Android R.
min_shipping_api_level: 30,
},
} }
cc_test { cc_test {
@ -283,6 +290,13 @@ cc_test {
cppflags: [ cppflags: [
"-DLIBSNAPSHOT_TEST_VABC_LEGACY", "-DLIBSNAPSHOT_TEST_VABC_LEGACY",
], ],
test_suites: [
"device-tests"
],
test_options: {
// Legacy VABC launched in Android S.
min_shipping_api_level: 31,
},
} }
cc_test { cc_test {