diff --git a/libs/minikin/Android.mk b/libs/minikin/Android.mk
index 2b12efbb6c638536a14ba1ee486bf165dc98b981..b0c2c80292b70f45307c35d3e2a041ac167e0b92 100644
--- a/libs/minikin/Android.mk
+++ b/libs/minikin/Android.mk
@@ -61,7 +61,8 @@ LOCAL_SRC_FILES := $(minikin_src_files)
 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
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -73,6 +74,8 @@ LOCAL_SRC_FILES := $(minikin_src_files)
 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
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -86,6 +89,8 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := frameworks/minikin/include
 LOCAL_C_INCLUDES := $(minikin_c_includes)
 LOCAL_CPPFLAGS += -Werror -Wall -Wextra $(enable_race_detection)
 LOCAL_SHARED_LIBRARIES := liblog libicuuc-host
+LOCAL_CLANG := true
+LOCAL_SANITIZE := signed-integer-overflow unsigned-integer-overflow
 
 LOCAL_SRC_FILES := Hyphenator.cpp