From 3ed78e47009f4918c4a904c52bd774c93e24c8c1 Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Wed, 14 Sep 2016 00:50:46 +0000 Subject: Revert "Workaround alloc-dealloc-mismatch error on ASan device boot." This reverts commit 22819276b147e34a80e8ca696be5b3fda68764b9. The underlying kernel bug has been fixed. Test: SANITIZE_TARGET=address build should continue working Change-Id: I6f3938047d9f60357e7bd9bccd3ef36d7686c73b --- services/surfaceflinger/SurfaceFlinger.cpp | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'services/surfaceflinger/SurfaceFlinger.cpp') diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 47f5401c13..dd5b034624 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -90,19 +90,6 @@ EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name); -// Workaround for b/30067360: /proc/self/environ inaccessible in SurfaceFlinger -// => ASan fails to read ASAN_OPTIONS => alloc-dealloc-mismatch bug is not -// suppressed and prevents the device from booting. -#ifndef __has_feature -#define __has_feature(x) 0 -#endif -#if __has_feature(address_sanitizer) -__attribute__((visibility("default"))) -extern "C" const char* __asan_default_options() { - return "alloc_dealloc_mismatch=0"; -} -#endif - namespace android { // This is the phase offset in nanoseconds of the software vsync event -- cgit v1.2.3-59-g8ed1b