diff options
| author | 2015-09-01 20:21:36 +0000 | |
|---|---|---|
| committer | 2015-09-01 20:21:36 +0000 | |
| commit | e89554a1489a17514a2af29e89932b5f743b1a27 (patch) | |
| tree | de15366f6ecd83577eba58a8faf67d0e990e27f2 | |
| parent | 5bffbf24287103a3e287f5b4e590f1573230e58f (diff) | |
| parent | 082fb1d8cb70952cda4d5ee1e79af3ee4572271a (diff) | |
am 082fb1d8: am 96343073: am dd80a6cf: Merge "aidl: Stop using Bionic\'s test main"
* commit '082fb1d8cb70952cda4d5ee1e79af3ee4572271a':
aidl: Stop using Bionic's test main
| -rw-r--r-- | tools/aidl/Android.mk | 3 | ||||
| -rw-r--r-- | tools/aidl/test_main.cpp | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tools/aidl/Android.mk b/tools/aidl/Android.mk index b478a4dae9e5..354563ae48bc 100644 --- a/tools/aidl/Android.mk +++ b/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) diff --git a/tools/aidl/test_main.cpp b/tools/aidl/test_main.cpp new file mode 100644 index 000000000000..4d820af774e1 --- /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(); +} |