diff --git a/engine/src/flutter/libs/minikin/Android.mk b/engine/src/flutter/libs/minikin/Android.mk index ad552f53583..67ac9f75ba9 100644 --- a/engine/src/flutter/libs/minikin/Android.mk +++ b/engine/src/flutter/libs/minikin/Android.mk @@ -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)