summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-12-11 14:19:03 -0800
committerandroid-build-merger <android-build-merger@google.com>2015-12-11 14:19:03 -0800
commit7410f4ee26ae91ef240e8e767e9f91e83ba32d38 (patch)
tree57b43a0cbbc6f8d97b3ab8c1cbea2d93780e2702
parent33ac50efbf0d77ee2848b2ad0464f1dce6428c15 (diff)
parent55181dbbcdc86b9abed8bd900f1041344211663c (diff)
downloadexternal_boringssl-7410f4ee26ae91ef240e8e767e9f91e83ba32d38.zip
external_boringssl-7410f4ee26ae91ef240e8e767e9f91e83ba32d38.tar.gz
external_boringssl-7410f4ee26ae91ef240e8e767e9f91e83ba32d38.tar.bz2
Do not sanitize host static libraries.
am: 55181dbbcd * commit '55181dbbcdc86b9abed8bd900f1041344211663c': Do not sanitize host static libraries.
-rw-r--r--Android.mk12
1 files changed, 12 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 7272c85..3e3ef2a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -59,6 +59,12 @@ LOCAL_CXX_STL := none
# Windows and Macs both have problems with assembly files
LOCAL_CFLAGS_darwin += -DOPENSSL_NO_ASM
LOCAL_CFLAGS_windows += -DOPENSSL_NO_ASM
+# TODO: b/26097626. ASAN breaks use of this library in JVM.
+# Re-enable sanitization when the issue with making clients of this library
+# preload ASAN runtime is resolved. Without that, clients are getting runtime
+# errors due to unresoled ASAN symbols, such as
+# __asan_option_detect_stack_use_after_return.
+LOCAL_SANITIZE := never
include $(LOCAL_PATH)/crypto-sources.mk
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -113,6 +119,12 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/ssl-sources.mk
LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION -DOPENSSL_SMALL -Wno-unused-parameter
LOCAL_CXX_STL := none
+# TODO: b/26097626. ASAN breaks use of this library in JVM.
+# Re-enable sanitization when the issue with making clients of this library
+# preload ASAN runtime is resolved. Without that, clients are getting runtime
+# errors due to unresoled ASAN symbols, such as
+# __asan_option_detect_stack_use_after_return.
+LOCAL_SANITIZE := never
include $(LOCAL_PATH)/ssl-sources.mk
include $(BUILD_HOST_STATIC_LIBRARY)