commit 698791cd1fa19532763e9f74a693509d4d578428
author Josh Gao <jmgao@google.com> Fri Jun 03 19:38:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 03 19:38:27 2016 +0000
tree b0fede4d89b7b0d8a04b8132f67d2d43626f2864
parent bd24e9b7a5ba1afd7f3eba64bf406e77af4468a0
parent 7dd93f4420de66278205c437fa65bb97bd0aa538

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

* commit '310da0b9904d33d58315a974351375bbc663bf89':
  cutils: don't fortify property_get on clang.

Change-Id: I04a0ea55a5c5b04d3c2180915bd52a7d3b5a95f3

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");