diff options
| author | Dan Albert | 2014-11-11 21:43:52 -0600 |
|---|---|---|
| committer | Android Git Automerger | 2014-11-11 21:43:52 -0600 |
| commit | e924cced8e816dc655833d49b61a627814c57645 (patch) | |
| tree | 3a2aec49a79ffa0e5ae498be4a471c8d4c0fd1eb /libion | |
| parent | c3939f08dafd5d0f24a9a8128e42bebde368b304 (diff) | |
| parent | 498c8135b46b976806fb4e335071c11fc2c51776 (diff) | |
| download | platform-system-core-e924cced8e816dc655833d49b61a627814c57645.tar.gz platform-system-core-e924cced8e816dc655833d49b61a627814c57645.tar.xz platform-system-core-e924cced8e816dc655833d49b61a627814c57645.zip | |
am 498c8135: am 7d196df6: Merge "Move some tests to libc++."
* commit '498c8135b46b976806fb4e335071c11fc2c51776':
Move some tests to libc++.
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 | |||
| 21 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk | 21 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk |
| 22 | LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers | 22 | LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers |
| 23 | LOCAL_SHARED_LIBRARIES += libion | 23 | LOCAL_SHARED_LIBRARIES += libion |
| 24 | LOCAL_STATIC_LIBRARIES += libgtest_main | ||
| 25 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/../kernel-headers | 24 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/../kernel-headers |
| 26 | LOCAL_SRC_FILES := \ | 25 | LOCAL_SRC_FILES := \ |
| 27 | ion_test_fixture.cpp \ | 26 | ion_test_fixture.cpp \ |