From 72c026822d32550b10bb62949644c10826d7658e Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 6 Jan 2016 20:28:52 -0800 Subject: [PATCH] Minikin: Disable sanitizer on x86 Disable unsigned-integer-overflow sanitizer on x86, as it crashes. Bug: 25884483 Bug: 26432628 Change-Id: Ia658ed56a6c81660a36edf71f7116118056aa917 --- libs/minikin/Android.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libs/minikin/Android.mk b/libs/minikin/Android.mk index 428f49b495..f91a4a80d3 100644 --- a/libs/minikin/Android.mk +++ b/libs/minikin/Android.mk @@ -51,7 +51,11 @@ 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 +LOCAL_SANITIZE := signed-integer-overflow +# b/26432628. +ifeq ($(filter x86%,$(TARGET_ARCH)),) + LOCAL_SANITIZE += unsigned-integer-overflow +endif include $(BUILD_SHARED_LIBRARY) @@ -64,7 +68,11 @@ 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 +LOCAL_SANITIZE := signed-integer-overflow +# b/26432628. +ifeq ($(filter x86%,$(TARGET_ARCH)),) + LOCAL_SANITIZE += unsigned-integer-overflow +endif include $(BUILD_STATIC_LIBRARY) -- GitLab