Minikin: Disable sanitizer on x86 am: 251f4772fb

am: 473628753d

* commit '473628753d2187af012f7486723ab9b8ccbbc2b3':
  Minikin: Disable sanitizer on x86
This commit is contained in:
Andreas Gampe 2016-01-07 04:47:52 +00:00 committed by android-build-merger
commit 4bb53ef025

View File

@ -62,7 +62,11 @@ LOCAL_C_INCLUDES := $(minikin_c_includes)
LOCAL_CPPFLAGS += -Werror -Wall -Wextra $(enable_race_detection)
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)
@ -76,7 +80,11 @@ LOCAL_C_INCLUDES := $(minikin_c_includes)
LOCAL_CPPFLAGS += -Werror -Wall -Wextra $(enable_race_detection)
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)