firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minikin: Disable sanitizer on x86

Browse Source 
am: 251f4772fb

* commit '251f4772fb6996b5b8555fa94dd67f97a0377650':
  Minikin: Disable sanitizer on x86
This commit is contained in:
Andreas Gampe
2016-01-07 04:45:20 +00:00
committed by android-build-merger
parent 7521326d4f 251f4772fb
commit 473628753d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/src/flutter/libs/minikin/Android.mk
View File

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