commit 927877c7d3173c1259732e51428f4ae38dc6bc4f
author Dimitry Ivanov <dimitry@google.com> Wed Sep 21 11:17:13 2016 -0700
committer Dimitry Ivanov <dimitry@google.com> Mon Oct 10 13:56:20 2016 -0700
tree fc558a23c5b705ffcfaff7e6e4b2278a27e3d0c2
parent 708589f5e8244a17d690848eed5f0fbfcce48a26

bionic-unit-tests: remove dependency on ANDROID_DATA

Replace references to ANDROID_DATA enviroment variable with references
to g_testlib_root.

Bug: http://b/22182538
Test: build and run bionic-unit-tests --gtest_filter=dl*:Dl*
Test: make cts && cts-tradefed run singleCommand cts --skip-preconditions -m CtsBionicTestCases
Change-Id: I5667e991551cec55b9b664f2f0063039671ff34b

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 673bfd0..3e1e13b 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -250,7 +250,16 @@
 cc_test_library {
     name: "libBionicGtestMain",
     defaults: ["bionic_tests_defaults"],
-    srcs: ["gtest_main.cpp"],
+    srcs: [
+        "gtest_main.cpp",
+        "gtest_globals.cpp",
+    ],
+    static_libs: [
+        "libbase",
+    ],
+    include_dirs: [
+        "bionic/libc",
+    ],
     target: {
         darwin: {
             enabled: true,
@@ -300,7 +309,10 @@
 cc_test_library {
     name: "libBionicCtsGtestMain",
     defaults: ["bionic_tests_defaults"],
-    srcs: ["gtest_main.cpp"],
+    srcs: [
+        "gtest_main.cpp",
+        "gtest_globals_cts.cpp",
+    ],
     cppflags: ["-DUSING_GTEST_OUTPUT_FORMAT"],
     shared: {
         enabled: false,