commit dd80a6cf37799b41ae07c60137d312c5ea2db961
author Christopher Wiley <wiley@google.com> Tue Sep 01 19:46:21 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 01 19:46:21 2015 +0000
tree fd8ce227e2eda8540ca7af0b9261bf5c8c40441e
parent 722bf5c7dec37265021c17d35b0b078776699f97
parent 1006bfe09ddeeca08fe7105382959d97abc89948

Merge "aidl: Stop using Bionic's test main"

tools/aidl/Android.mk

diff --git a/tools/aidl/Android.mk b/tools/aidl/Android.mk
index b478a4d..354563a 100644
--- a/tools/aidl/Android.mk
+++ b/tools/aidl/Android.mk
@@ -56,13 +56,14 @@
 LOCAL_CFLAGS := -g -DUNIT_TEST -Wall -Werror
 LOCAL_SRC_FILES := \
     options_unittest.cpp \
+    test_main.cpp \
     tests/test.cpp \
 
 LOCAL_STATIC_LIBRARIES := \
     libaidl-common \
     libgmock_host \
     libgtest_host \
-    libBionicGtestMain
+
 LOCAL_LDLIBS := -lrt
 include $(BUILD_HOST_NATIVE_TEST)
 

tools/aidl/test_main.cpp

diff --git a/tools/aidl/test_main.cpp b/tools/aidl/test_main.cpp
new file mode 100644
index 0000000..4d820af
--- /dev/null
+++ b/tools/aidl/test_main.cpp
@@ -0,0 +1,6 @@
+#include <gtest/gtest.h>
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}