commit | d978a9edb72c818ae3aa2527496ce987f9ef555d | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Wed Mar 11 17:29:33 2015 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Mar 11 17:29:33 2015 +0000 |
tree | acf7d1291abf8d3be2287ea0ae8cde83d33a2c35 | |
parent | 74cae37f5f0a088eb8b37cea6d16fb7f5a2e23c5 [diff] | |
parent | a64e43f4eb2f51b29fe1c9109e34bbe40efc35df [diff] |
Merge "Apparently not all our toolchains have -fstack-protector-strong yet."
diff --git a/Android.mk b/Android.mk index 6fd3f57..e208225 100644 --- a/Android.mk +++ b/Android.mk
@@ -45,7 +45,7 @@ -Wno-deprecated-declarations \ -fno-asynchronous-unwind-tables \ -fno-strict-aliasing \ - -fstack-protector-strong -fwrapv \ + -fstack-protector -fwrapv \ # ...and CPPFLAGS. LOCAL_CFLAGS += \