diff options
| author |   Elliott Hughes <enh@google.com> | 2016-10-07 15:41:05 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2016-10-07 15:41:05 -0700 |
| commit | 8fd22fa4942496033c0a32db95aed724a1688634 (patch) | |
| tree | ae9d49a151168f4a7e8bdf4cba24e356cbb175ae /native/jni | |
| parent | 8181498163f088f2dbd5fa093e6f6beb3445a848 (diff) | |
| download | latinime-8fd22fa4942496033c0a32db95aed724a1688634.tar.gz latinime-8fd22fa4942496033c0a32db95aed724a1688634.tar.xz latinime-8fd22fa4942496033c0a32db95aed724a1688634.zip | |
Rely on the platform -std default.
Bug: http://b/32019064
Test: builds
Change-Id: I17611b6d9598992bd52cf3dc93509f0f5e0bdcde
Diffstat (limited to 'native/jni')
| -rw-r--r-- | native/jni/HostUnitTests.mk | 6 | ||||
| -rw-r--r-- | native/jni/TargetUnitTests.mk | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/native/jni/HostUnitTests.mk b/native/jni/HostUnitTests.mk index e30d50a2e..6a8bcec2d 100644 --- a/native/jni/HostUnitTests.mk +++ b/native/jni/HostUnitTests.mk @@ -27,10 +27,9 @@ include $(CLEAR_VARS) include $(LOCAL_PATH)/NativeFileList.mk #################### Host library for unit test -# TODO: Remove -std=c++11 once it is set by default on host build. LATIN_IME_SRC_DIR := src LOCAL_ADDRESS_SANITIZER := true -LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function +LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function LOCAL_CLANG := true LOCAL_CXX_STL := libc++ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) @@ -43,8 +42,7 @@ include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) LATIN_IME_TEST_SRC_DIR := tests LOCAL_ADDRESS_SANITIZER := true -# TODO: Remove -std=c++11 once it is set by default on host build. -LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function +LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function LOCAL_CLANG := true LOCAL_CXX_STL := libc++ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) diff --git a/native/jni/TargetUnitTests.mk b/native/jni/TargetUnitTests.mk index eefd4fcf3..69a32edbd 100644 --- a/native/jni/TargetUnitTests.mk +++ b/native/jni/TargetUnitTests.mk @@ -21,7 +21,7 @@ include $(LOCAL_PATH)/NativeFileList.mk #################### Target library for unit test LATIN_IME_SRC_DIR := src -LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function +LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function LOCAL_CLANG := true LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) LOCAL_MODULE := liblatinime_target_static_for_unittests @@ -34,7 +34,7 @@ include $(BUILD_STATIC_LIBRARY) #################### Target native tests include $(CLEAR_VARS) LATIN_IME_TEST_SRC_DIR := tests -LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function +LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function LOCAL_CLANG := true LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) LOCAL_MODULE := liblatinime_target_unittests |