From 74ebdf3c8e040b12c4987fb28d24e9db217a89f2 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Mon, 2 May 2016 19:20:26 -0700 Subject: [PATCH] cutils: don't fortify property_get on clang. clang doesn't do the frontend inlining/dead code elimination needed for the fortified implementation to work. Therefore, turn it off. Bug: http://b/28381737 Change-Id: Ie8dd970e3908b1daaa587ad2bd041e8f6e2089db --- include/cutils/properties.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/cutils/properties.h b/include/cutils/properties.h index 24aa224f6..adf670bf1 100644 --- a/include/cutils/properties.h +++ b/include/cutils/properties.h @@ -109,7 +109,7 @@ int property_set(const char *key, const char *value); int property_list(void (*propfn)(const char *key, const char *value, void *cookie), void *cookie); -#if defined(__BIONIC_FORTIFY) +#if defined(__BIONIC_FORTIFY) && !defined(__clang__) extern int __property_get_real(const char *, char *, const char *) __asm__(__USER_LABEL_PREFIX__ "property_get");