diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-14 21:55:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-14 21:55:42 +0000 |
| commit | 2dd1bbacdea30570a5456eeebca705b2c07659af (patch) | |
| tree | fbb42bf9a9b5433d87afbebd89a71e00855c737d /libion | |
| parent | 8552b0ab0f1bf6896b8dbb22b2fb314fe8f73190 (diff) | |
| parent | 9f5f81bfa2c7eb581fd6b2c735ac143fca07e70e (diff) | |
| download | system_core-2dd1bbacdea30570a5456eeebca705b2c07659af.tar.gz system_core-2dd1bbacdea30570a5456eeebca705b2c07659af.tar.bz2 system_core-2dd1bbacdea30570a5456eeebca705b2c07659af.zip | |
am 9f5f81bf: am 133b7d4a: Merge "Don\'t manually link libgtest_main in libion tests."
* commit '9f5f81bfa2c7eb581fd6b2c735ac143fca07e70e':
Don't manually link libgtest_main in libion tests.
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 8dc7f9d1d..abf527ad6 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 \ |