commit 0485fd3c2dd0cbf40504c15e372d72e9739c9c97
author Josh Gao <jmgao@google.com> Fri Jun 03 19:46:05 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 03 19:46:05 2016 +0000
tree d08f0203ea0aee85d1c04135a54778bfacb55ad7
parent a542c76beb647a623dc4eef3acd4c02fefdfbd00
parent 698791cd1fa19532763e9f74a693509d4d578428

Merge "cutils: don\'t fortify property_get on clang." am: 310da0b990
am: 2a1f209245

* commit '2a1f20924516b41e22adb766b6751869fb5c3af4':
  cutils: don't fortify property_get on clang.

Change-Id: Idd7402dca16633fa19e2110b6d74b005b3e519f9

include/cutils/properties.h

diff --git a/include/cutils/properties.h b/include/cutils/properties.h
index 24aa224..adf670b 100644
--- a/include/cutils/properties.h
+++ b/include/cutils/properties.h
@@ -109,7 +109,7 @@
     
 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");