diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-12 16:37:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 16:37:16 +0000 |
| commit | c7c75cd483156e41f99a85c911aa902302f8b2b6 (patch) | |
| tree | 2caca94fa6c14fbf9984b6b30f0a35c3fdad0efe /libion | |
| parent | ff0079fc8fdd60f818113459483b5983a2cd8ba3 (diff) | |
| parent | 21d8d89c7cda35ad1571375cf051c0b050604619 (diff) | |
| download | core-c7c75cd483156e41f99a85c911aa902302f8b2b6.tar.gz core-c7c75cd483156e41f99a85c911aa902302f8b2b6.tar.bz2 core-c7c75cd483156e41f99a85c911aa902302f8b2b6.zip | |
am 21d8d89c: am 06279285: Merge "Revert "Move some tests to libc++.""
* commit '21d8d89c7cda35ad1571375cf051c0b050604619':
Revert "Move some tests to libc++."
Diffstat (limited to 'libion')
| -rw-r--r-- | libion/tests/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libion/tests/Android.mk b/libion/tests/Android.mk index abf527ad6..8dc7f9d1d 100644 --- a/libion/tests/Android.mk +++ b/libion/tests/Android.mk @@ -21,6 +21,7 @@ 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 \ |