Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2af7017 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Rely on the platform -std default."

parents 81814981 8fd22fa4

native/dicttoolkit/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ LOCAL_CFLAGS += -Werror -Wall -Wextra -Weffc++ -Wformat=2 -Wcast-qual -Wcast-ali 


# To suppress compiler warnings for unused variables/functions used for debug features etc.

LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function

LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function

LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function



include $(LOCAL_PATH)/NativeFileList.mk

include $(LATIN_IME_CORE_PATH)/NativeFileList.mk

native/dicttoolkit/UnitTests.mk

+2 −4
Original line number Diff line number Diff line
@@ -28,10 +28,9 @@ LATIN_DICT_TOOLKIT_TEST_SRC_DIR := tests 
include $(LOCAL_PATH)/NativeFileList.mk

include $(LATIN_IME_CORE_PATH)/NativeFileList.mk



# 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_DICT_TOOLKIT_SRC_DIR) \
@@ -45,9 +44,8 @@ include $(BUILD_HOST_STATIC_LIBRARY) 


include $(CLEAR_VARS)



# TODO: Remove -std=c++11 once it is set by default on host build.

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_DICT_TOOLKIT_SRC_DIR) \

native/jni/HostUnitTests.mk

+2 −4
Original line number Diff line number Diff line
@@ -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)

native/jni/TargetUnitTests.mk

+2 −2
Original line number Diff line number Diff line
@@ -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

tools/dicttool/NativeLib.mk

+0 −3
Original line number Diff line number Diff line
@@ -34,9 +34,6 @@ ifneq ($(strip $(HOST_JDK_IS_64BIT_VERSION)),) 
LOCAL_MULTILIB := 64

endif #HOST_JDK_IS_64BIT_VERSION



# For C++11

LOCAL_CFLAGS += -std=c++11



LATINIME_NATIVE_JNI_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni

LATINIME_NATIVE_SRC_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni/src

LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(LATINIME_NATIVE_SRC_DIR)