am dd80a6cf: Merge "aidl: Stop using Bionic\'s test main"

* commit 'dd80a6cf37799b41ae07c60137d312c5ea2db961':
  aidl: Stop using Bionic's test main

tools/aidl/Android.mk

@@ -56,13 +56,14 @@ LOCAL_MODULE := aidl_unittests
 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

@@ -0,0 +1,6 @@
+#include <gtest/gtest.h>
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}