diff options
| author | Christopher Ferris <cferris@google.com> | 2018-10-02 01:36:50 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-10-02 01:36:50 +0200 |
| commit | e4f6fa690cc151c026cbc44c6052ea7a2246cc86 (patch) | |
| tree | b8be93bbc82b023a92e4f8bc47026db6886d949b | |
| parent | Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency."" (diff) | |
| parent | Merge "Move to new isolation test runner." (diff) | |
| download | android_bootable_recovery-e4f6fa690cc151c026cbc44c6052ea7a2246cc86.tar android_bootable_recovery-e4f6fa690cc151c026cbc44c6052ea7a2246cc86.tar.gz android_bootable_recovery-e4f6fa690cc151c026cbc44c6052ea7a2246cc86.tar.bz2 android_bootable_recovery-e4f6fa690cc151c026cbc44c6052ea7a2246cc86.tar.lz android_bootable_recovery-e4f6fa690cc151c026cbc44c6052ea7a2246cc86.tar.xz android_bootable_recovery-e4f6fa690cc151c026cbc44c6052ea7a2246cc86.tar.zst android_bootable_recovery-e4f6fa690cc151c026cbc44c6052ea7a2246cc86.zip | |
| -rw-r--r-- | minadbd/Android.bp | 2 | ||||
| -rw-r--r-- | tests/Android.bp | 11 |
2 files changed, 5 insertions, 8 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..9824123c0 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -99,6 +99,7 @@ librecovery_static_libs = [ cc_test { name: "recovery_unit_test", + isolated: true, defaults: [ "recovery_test_defaults", @@ -117,7 +118,6 @@ cc_test { "libotautil", "libupdater", "libgtest_prod", - "libBionicGtestMain", ], data: ["testdata/*"], @@ -125,6 +125,7 @@ cc_test { cc_test { name: "recovery_manual_test", + isolated: true, defaults: [ "recovery_test_defaults", @@ -135,14 +136,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 +157,6 @@ cc_test { "libupdater", "libupdate_verifier", "libprotobuf-cpp-lite", - "libBionicGtestMain", ], data: [ @@ -170,6 +167,7 @@ cc_test { cc_test_host { name: "recovery_host_test", + isolated: true, defaults: [ "recovery_test_defaults", @@ -193,7 +191,6 @@ cc_test_host { "libdivsufsort64", "libdivsufsort", "libz", - "libBionicGtestMain", ], data: ["testdata/*"], |