From 342cd45a5e5779e81155515d36cd500bfd975fdf Mon Sep 17 00:00:00 2001 From: Dan Austin Date: Wed, 6 Jan 2016 18:31:38 +0000 Subject: [PATCH] Revert "Enable integer sanitization in libminikin." This reverts commit 9c13a3dc96d16976c45417bdc34e0fc5670815b9. Change-Id: Iecd1f61a5fdf5955d871a920cb243553857d46ff --- libs/minikin/Android.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libs/minikin/Android.mk b/libs/minikin/Android.mk index e51e4668f93..c3e70db2675 100644 --- a/libs/minikin/Android.mk +++ b/libs/minikin/Android.mk @@ -50,8 +50,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := frameworks/minikin/include LOCAL_SRC_FILES := $(minikin_src_files) LOCAL_C_INCLUDES := $(minikin_c_includes) LOCAL_SHARED_LIBRARIES := $(minikin_shared_libraries) -LOCAL_CLANG := true -LOCAL_SANITIZE := signed-integer-overflow unsigned-integer-overflow + include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -62,8 +61,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := frameworks/minikin/include LOCAL_SRC_FILES := $(minikin_src_files) LOCAL_C_INCLUDES := $(minikin_c_includes) LOCAL_SHARED_LIBRARIES := $(minikin_shared_libraries) -LOCAL_CLANG := true -LOCAL_SANITIZE := signed-integer-overflow unsigned-integer-overflow include $(BUILD_STATIC_LIBRARY) @@ -76,8 +73,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_EXPORT_C_INCLUDE_DIRS := frameworks/minikin/include LOCAL_C_INCLUDES := $(minikin_c_includes) LOCAL_SHARED_LIBRARIES := liblog libicuuc-host -LOCAL_CLANG := true -LOCAL_SANITIZE := signed-integer-overflow unsigned-integer-overflow LOCAL_SRC_FILES := Hyphenator.cpp