diff options
| -rw-r--r-- | minadbd/Android.bp | 2 | ||||
| -rw-r--r-- | tests/Android.bp | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/minadbd/Android.bp b/minadbd/Android.bp index 00244ee7e..370232b3f 100644 --- a/minadbd/Android.bp +++ b/minadbd/Android.bp @@ -52,6 +52,7 @@ cc_library { cc_test { name: "minadbd_test", + isolated: true, defaults: [ "minadbd_defaults", @@ -64,7 +65,6 @@ cc_test { static_libs: [ "libminadbd_services", "libadbd", - "libBionicGtestMain", ], shared_libs: [ diff --git a/tests/Android.bp b/tests/Android.bp index ab4d31da2..2cfc32572 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -45,7 +45,7 @@ cc_defaults { static_libs: [ "libutils", ], - } + }, }, } @@ -93,12 +93,14 @@ librecovery_static_libs = [ "libhidlbase", "libhidltransport", "libhwbinder", + "libbinderthreadstate", "libvndksupport", "libtinyxml2", ] cc_test { name: "recovery_unit_test", + isolated: true, defaults: [ "recovery_test_defaults", @@ -117,7 +119,6 @@ cc_test { "libotautil", "libupdater", "libgtest_prod", - "libBionicGtestMain", ], data: ["testdata/*"], @@ -125,6 +126,7 @@ cc_test { cc_test { name: "recovery_manual_test", + isolated: true, defaults: [ "recovery_test_defaults", @@ -135,14 +137,11 @@ cc_test { srcs: [ "manual/recovery_test.cpp", ], - - static_libs: [ - "libBionicGtestMain", - ], } cc_test { name: "recovery_component_test", + isolated: true, defaults: [ "recovery_test_defaults", @@ -159,7 +158,6 @@ cc_test { "libupdater", "libupdate_verifier", "libprotobuf-cpp-lite", - "libBionicGtestMain", ], data: [ @@ -170,6 +168,7 @@ cc_test { cc_test_host { name: "recovery_host_test", + isolated: true, defaults: [ "recovery_test_defaults", @@ -193,7 +192,6 @@ cc_test_host { "libdivsufsort64", "libdivsufsort", "libz", - "libBionicGtestMain", ], data: ["testdata/*"], |