Merge "Move to new isolation test runner."

am: d87a79a947

Change-Id: Icdda931c0807d43fde1a6b7fa44a6af5306efeb9
This commit is contained in:
Christopher Ferris 2018-10-01 16:36:50 -07:00 committed by android-build-merger
commit e4f6fa690c
2 changed files with 5 additions and 8 deletions

View file

@ -52,6 +52,7 @@ cc_library {
cc_test { cc_test {
name: "minadbd_test", name: "minadbd_test",
isolated: true,
defaults: [ defaults: [
"minadbd_defaults", "minadbd_defaults",
@ -64,7 +65,6 @@ cc_test {
static_libs: [ static_libs: [
"libminadbd_services", "libminadbd_services",
"libadbd", "libadbd",
"libBionicGtestMain",
], ],
shared_libs: [ shared_libs: [

View file

@ -99,6 +99,7 @@ librecovery_static_libs = [
cc_test { cc_test {
name: "recovery_unit_test", name: "recovery_unit_test",
isolated: true,
defaults: [ defaults: [
"recovery_test_defaults", "recovery_test_defaults",
@ -117,7 +118,6 @@ cc_test {
"libotautil", "libotautil",
"libupdater", "libupdater",
"libgtest_prod", "libgtest_prod",
"libBionicGtestMain",
], ],
data: ["testdata/*"], data: ["testdata/*"],
@ -125,6 +125,7 @@ cc_test {
cc_test { cc_test {
name: "recovery_manual_test", name: "recovery_manual_test",
isolated: true,
defaults: [ defaults: [
"recovery_test_defaults", "recovery_test_defaults",
@ -135,14 +136,11 @@ cc_test {
srcs: [ srcs: [
"manual/recovery_test.cpp", "manual/recovery_test.cpp",
], ],
static_libs: [
"libBionicGtestMain",
],
} }
cc_test { cc_test {
name: "recovery_component_test", name: "recovery_component_test",
isolated: true,
defaults: [ defaults: [
"recovery_test_defaults", "recovery_test_defaults",
@ -159,7 +157,6 @@ cc_test {
"libupdater", "libupdater",
"libupdate_verifier", "libupdate_verifier",
"libprotobuf-cpp-lite", "libprotobuf-cpp-lite",
"libBionicGtestMain",
], ],
data: [ data: [
@ -170,6 +167,7 @@ cc_test {
cc_test_host { cc_test_host {
name: "recovery_host_test", name: "recovery_host_test",
isolated: true,
defaults: [ defaults: [
"recovery_test_defaults", "recovery_test_defaults",
@ -193,7 +191,6 @@ cc_test_host {
"libdivsufsort64", "libdivsufsort64",
"libdivsufsort", "libdivsufsort",
"libz", "libz",
"libBionicGtestMain",
], ],
data: ["testdata/*"], data: ["testdata/*"],