diff options
| author | Elliott Hughes <enh@google.com> | 2015-03-11 17:29:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-11 17:29:33 +0000 |
| commit | d978a9edb72c818ae3aa2527496ce987f9ef555d (patch) | |
| tree | acf7d1291abf8d3be2287ea0ae8cde83d33a2c35 | |
| parent | 74cae37f5f0a088eb8b37cea6d16fb7f5a2e23c5 (diff) | |
| parent | a64e43f4eb2f51b29fe1c9109e34bbe40efc35df (diff) | |
| download | mksh-d978a9edb72c818ae3aa2527496ce987f9ef555d.tar.gz | |
Merge "Apparently not all our toolchains have -fstack-protector-strong yet."android-wear-5.1.1_r1android-wear-5.1.0_r1
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -45,7 +45,7 @@ LOCAL_CFLAGS += \ -Wno-deprecated-declarations \ -fno-asynchronous-unwind-tables \ -fno-strict-aliasing \ - -fstack-protector-strong -fwrapv \ + -fstack-protector -fwrapv \ # ...and CPPFLAGS. LOCAL_CFLAGS += \ |