Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '96343073d63c72afa75057129abea4f0d4f8c103':
  aidl: Stop using Bionic's test main
This commit is contained in:
Christopher Wiley
2015-09-01 20:11:55 +00:00
committed by Android Git Automerger
parent 59b41c6418 96343073d6
commit 082fb1d8cb
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/aidl/Android.mk
View File

@@ -56,13 +56,14 @@ LOCAL_MODULE := aidl_unittests
LOCAL_CFLAGS := -g -DUNIT_TEST -Wall -Werror LOCAL_CFLAGS := -g -DUNIT_TEST -Wall -Werror
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
options_unittest.cpp \ options_unittest.cpp \
test_main.cpp \
tests/test.cpp \ tests/test.cpp \
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libaidl-common \ libaidl-common \
libgmock_host \ libgmock_host \
libgtest_host \ libgtest_host \
libBionicGtestMain
LOCAL_LDLIBS := -lrt LOCAL_LDLIBS := -lrt
include $(BUILD_HOST_NATIVE_TEST) include $(BUILD_HOST_NATIVE_TEST)

6
tools/aidl/test_main.cpp Normal file
View File

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