Merge "cutils: don't fortify property_get on clang."

2016-06-03 19:29:12 +00:00 · 2016-06-03 19:29:12 +00:00 · 310da0b990
parent ce5b4fee23 74ebdf3c8e
commit 310da0b990
1 changed files with 1 additions and 1 deletions
--- 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");