diff --git a/libs/minikin/Android.mk b/libs/minikin/Android.mk
index c3e70db26755dc47bce8ea80fb15c5f5b418d808..e51e4668f938d8fd405ff10c2bd9816707ca042c 100644
--- a/libs/minikin/Android.mk
+++ b/libs/minikin/Android.mk
@@ -50,7 +50,8 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := frameworks/minikin/include
 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
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -61,6 +62,8 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := frameworks/minikin/include
 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
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -73,6 +76,8 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_EXPORT_C_INCLUDE_DIRS := frameworks/minikin/include
 LOCAL_C_INCLUDES := $(minikin_c_includes)
 LOCAL_SHARED_LIBRARIES := liblog libicuuc-host
+LOCAL_CLANG := true
+LOCAL_SANITIZE := signed-integer-overflow unsigned-integer-overflow
 
 LOCAL_SRC_FILES := Hyphenator.cpp