From 272467d95018c481b26922130616b1086b331cee Mon Sep 17 00:00:00 2001
From: Christopher Ferris <cferris@google.com>
Date: Wed, 22 Aug 2018 19:38:49 -0700
Subject: Move to new isolation test runner.

Test: Ran tests.
Change-Id: I5fa99f7b6b03c7b9247b4f340f3df982063b0e3e
---
 minadbd/Android.bp |  2 +-
 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/*"],
-- 
cgit v1.2.3


From d24b054fa873887ee63f55cde310ead1d9fc6dfd Mon Sep 17 00:00:00 2001
From: Jayant Chowdhary <jchowdhary@google.com>
Date: Mon, 1 Oct 2018 22:55:56 +0000
Subject: Reland: "recovery_test_component: Add libbinderthreadstate as static 
         dependency."

This reverts commit 26b86bb1dc895881cf507dfab0850c47c68c2779.

Reason for revert: Dependencies which broke tests due to exclusion from
                   LOCAL_JNI_SHARED_LIBS have been added.

Change-Id: I364acfe8bd0526fb26f69cc29fb3545fc3e79764
---
 tests/Android.bp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/Android.bp b/tests/Android.bp
index ab4d31da2..9f3dce78c 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -45,7 +45,7 @@ cc_defaults {
             static_libs: [
                 "libutils",
             ],
-        }
+        },
     },
 }
 
@@ -93,6 +93,7 @@ librecovery_static_libs = [
     "libhidlbase",
     "libhidltransport",
     "libhwbinder",
+    "libbinderthreadstate",
     "libvndksupport",
     "libtinyxml2",
 ]
-- 
cgit v1.2.3