diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-14 10:59:34 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-14 11:00:46 -0800 |
| commit | abe8d148b9215bd388f953f04df1ad77ff613b45 (patch) | |
| tree | a36b53ba7926c178c2665a9b979c35132e3bb9e0 /libion | |
| parent | 6ef68b55b77b199fdcef2822750a392e1d0a4b04 (diff) | |
| download | system_core-abe8d148b9215bd388f953f04df1ad77ff613b45.zip system_core-abe8d148b9215bd388f953f04df1ad77ff613b45.tar.gz system_core-abe8d148b9215bd388f953f04df1ad77ff613b45.tar.bz2 | |
Don't manually link libgtest_main in libion tests.
This is actually probably broken right now, since these tests are
getting both the libc++ flavor and stlport flavor of libgtest_main.
Bug: 15193147
Change-Id: Ic2f8dda98240c12591803f3c3522505314a05609
Diffstat (limited to 'libion')
| -rw-r--r-- | libion/tests/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libion/tests/Android.mk b/libion/tests/Android.mk index 8dc7f9d..abf527a 100644 --- a/libion/tests/Android.mk +++ b/libion/tests/Android.mk @@ -21,7 +21,6 @@ LOCAL_MODULE := ion-unit-tests LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers LOCAL_SHARED_LIBRARIES += libion -LOCAL_STATIC_LIBRARIES += libgtest_main LOCAL_C_INCLUDES := $(LOCAL_PATH)/../kernel-headers LOCAL_SRC_FILES := \ ion_test_fixture.cpp \ |