summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2016-01-26 00:44:02 -0800
committerThe Android Automerger <android-build@google.com>2016-01-26 07:33:07 -0800
commit3a2a4a99ce0189d9f28e5f7c2cbab8076f6fadeb (patch)
tree2ec154349b2d8a33120b663b1dde5b52d4ba8d9f
parent1ae4af4c78d8ca5eb537d3e8ff1847866ed2be80 (diff)
downloadandroid_frameworks_minikin-3a2a4a99ce0189d9f28e5f7c2cbab8076f6fadeb.tar.gz
android_frameworks_minikin-3a2a4a99ce0189d9f28e5f7c2cbab8076f6fadeb.tar.bz2
android_frameworks_minikin-3a2a4a99ce0189d9f28e5f7c2cbab8076f6fadeb.zip
Disable unsigned integer overflow sanitization until libc++ is fixed.
Bug: http://b/26781196 Bug: http://b/25884483 Bug: http://b/26432628 Although this issue was first only manifesting on Fugu, it now affects N9 and N6p as well. This change disables unsigned overflow sanitization on all platforms. The real fix for libc++ (r257368) can't be committed until we have updated Clang at least one more time. Change-Id: I71e9c50d25ae4566d4c06f348183c4b22a4bb60a
-rw-r--r--libs/minikin/Android.mk8
1 files changed, 2 insertions, 6 deletions
diff --git a/libs/minikin/Android.mk b/libs/minikin/Android.mk
index 67ac9f7..769b5fc 100644
--- a/libs/minikin/Android.mk
+++ b/libs/minikin/Android.mk
@@ -64,9 +64,7 @@ LOCAL_SHARED_LIBRARIES := $(minikin_shared_libraries)
LOCAL_CLANG := true
LOCAL_SANITIZE := signed-integer-overflow
# b/26432628.
-ifeq ($(filter x86%,$(TARGET_ARCH)),)
- LOCAL_SANITIZE += unsigned-integer-overflow
-endif
+#LOCAL_SANITIZE += unsigned-integer-overflow
include $(BUILD_SHARED_LIBRARY)
@@ -82,9 +80,7 @@ LOCAL_SHARED_LIBRARIES := $(minikin_shared_libraries)
LOCAL_CLANG := true
LOCAL_SANITIZE := signed-integer-overflow
# b/26432628.
-ifeq ($(filter x86%,$(TARGET_ARCH)),)
- LOCAL_SANITIZE += unsigned-integer-overflow
-endif
+#LOCAL_SANITIZE += unsigned-integer-overflow
include $(BUILD_STATIC_LIBRARY)