commit c27d471742df9e69d4c0d932e8d7c11455bc3551
author Dan Albert <danalbert@google.com> Tue Jun 16 21:12:22 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 16 21:13:44 2015 +0000
tree 9ba59dc336dd187634123304afff3ffdc0c1d30d
parent dcac45820e4ce7faad4dbfd187f8b788964c9981
parent 7508a81d40dcda7367073f3f945b3e8b32ea9d04

Merge "Fix libdl inclusion for default-ub."

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 48cedce..21b8294 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -151,6 +151,7 @@
 LOCAL_CTS_TEST_RUNNER:=
 LOCAL_CLANG:=
 LOCAL_ADDRESS_SANITIZER:=
+LOCAL_DETECT_INTEGER_OVERFLOWS:=
 LOCAL_JAR_EXCLUDE_FILES:=
 LOCAL_JAR_PACKAGES:=
 LOCAL_JAR_EXCLUDE_PACKAGES:=

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 87cf65c..bb18695 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -106,3 +106,13 @@
   recover_arg := $(subst $(space),$(comma),$(LOCAL_SANITIZE_RECOVER)),
   my_cflags += -fsanitize-recover=$(recover_arg)
 endif
+
+ifeq ($(strip $(LOCAL_DETECT_INTEGER_OVERFLOWS)),true)
+  ifeq ($(my_clang),true)
+    my_cflags += -fsanitize=signed-integer-overflow,unsigned-integer-overflow
+    my_cflags += -ftrap-function=abort
+    my_cflags += -fsanitize-undefined-trap-on-error
+  else
+    $(error $(LOCAL_MODULE): You must enable LOCAL_CLANG:=true to use LOCAL_DETECT_INTEGER_OVERFLOWS)
+  endif
+endif