commit 9e35c09854e55973731f80dd7cc41b80c20eec42
author Jorge Lucangeli Obes <jorgelo@google.com> Mon Apr 11 13:30:08 2016 -0700
committer Jorge Lucangeli Obes <jorgelo@google.com> Mon Apr 11 14:31:50 2016 -0700
tree b0c1de23e9d4218b94459b2ee52a7ec6a8babd0a
parent 2413f3713ae8a306a23550e2eecd59f380f34eae

Fix #ifdef statement.

Previous version did not compile with GCC.

Bug: None
Change-Id: I9f8b40e6e965a7573505cc7f3c1c650b37522926

Android.mk

diff --git a/Android.mk b/Android.mk
index b79a989..dd2db53 100644
--- a/Android.mk
+++ b/Android.mk
@@ -205,6 +205,8 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS := $(minijailCommonCFlags)
 LOCAL_CLANG := true
+# Don't build with ASan, but leave commented out for easy local debugging.
+# LOCAL_SANITIZE := address
 LOCAL_SRC_FILES := \
 	examples/drop_privs.cpp
 

util.h

diff --git a/util.h b/util.h
index b4efc2f..15dd56b 100644
--- a/util.h
+++ b/util.h
@@ -38,7 +38,11 @@
 }
 
 static inline int running_with_asan() {
-#if defined(__clang__) && __has_feature(address_sanitizer)
+#ifndef __has_feature
+#define __has_feature(x) 0
+#endif
+
+#if __has_feature(address_sanitizer)
 	return 1;
 #else
 	return 0;