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

Commit 584a03ec authored by Lennart Wieboldt's avatar Lennart Wieboldt Committed by android-build-merger
Browse files

Merge "Remove LOCAL_CLANG" am: ad5da588 

am: bd750da7

Change-Id: I5ad29dca6ba91e722232fc76802858276dd1b64c
parents bc47ef3c bd750da7

native/dicttoolkit/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ LOCAL_SRC_FILES := $(LATIN_IME_DICT_TOOLKIT_MAIN_SRC_FILES) \ 
LOCAL_MODULE := dicttoolkit

LOCAL_MODULE_TAGS := optional



LOCAL_CLANG := true

LOCAL_CXX_STL := libc++



include $(BUILD_HOST_EXECUTABLE)

native/dicttoolkit/UnitTests.mk

+0 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ include $(LATIN_IME_CORE_PATH)/NativeFileList.mk 
LATIN_IME_SRC_DIR := src

LOCAL_ADDRESS_SANITIZER := true

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

    $(LATIN_IME_CORE_PATH)/$(LATIN_IME_CORE_SRC_DIR)
@@ -46,7 +45,6 @@ include $(CLEAR_VARS) 


LOCAL_ADDRESS_SANITIZER := true

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

    $(LATIN_IME_CORE_PATH)/$(LATIN_IME_CORE_SRC_DIR)

native/jni/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ endif # FLAG_DO_PROFILE 
LOCAL_MODULE := libjni_latinime_common_static

LOCAL_MODULE_TAGS := optional



LOCAL_CLANG := true

LOCAL_SDK_VERSION := 14

LOCAL_NDK_STL_VARIANT := c++_static
@@ -87,7 +86,6 @@ endif # FLAG_DO_PROFILE 
LOCAL_MODULE := libjni_latinime

LOCAL_MODULE_TAGS := optional



LOCAL_CLANG := true

LOCAL_SDK_VERSION := 14

LOCAL_NDK_STL_VARIANT := c++_static

LOCAL_LDFLAGS += -ldl

native/jni/HostUnitTests.mk

+0 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ include $(LOCAL_PATH)/NativeFileList.mk 
LATIN_IME_SRC_DIR := src

LOCAL_ADDRESS_SANITIZER := true

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

LOCAL_CLANG := true

LOCAL_CXX_STL := libc++

LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)

LOCAL_MODULE := liblatinime_host_static_for_unittests
@@ -43,7 +42,6 @@ include $(CLEAR_VARS) 
LATIN_IME_TEST_SRC_DIR := tests

LOCAL_ADDRESS_SANITIZER := true

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

LOCAL_CLANG := true

LOCAL_CXX_STL := libc++

LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)

LOCAL_MODULE := liblatinime_host_unittests

native/jni/TargetUnitTests.mk

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ include $(LOCAL_PATH)/NativeFileList.mk 
#################### Target library for unit test

LATIN_IME_SRC_DIR := src

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

LOCAL_MODULE_TAGS := optional
@@ -35,7 +34,6 @@ include $(BUILD_STATIC_LIBRARY) 
include $(CLEAR_VARS)

LATIN_IME_TEST_SRC_DIR := tests

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

LOCAL_MODULE_TAGS := tests