diff options
| author | Torne (Richard Coles) <torne@google.com> | 2012-11-21 16:04:45 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2012-11-21 16:04:45 +0000 |
| commit | daff1761fc4be5c6686c9f8b75b8862b7cb02f10 (patch) | |
| tree | e218a1e36ee8e78337a23d50bbb70e0dd10750d1 | |
| parent | 9cf735d94e20b0c3b9694bfe9426baf1d04013a0 (diff) | |
| download | freetype-daff1761fc4be5c6686c9f8b75b8862b7cb02f10.tar.gz | |
Update makefiles after merge of Chromium at r169048
This commit was generated by merge_from_chromium.py.
Change-Id: I6d6af7db8a1e104ec4e9a5f161a02be1256becea
| -rw-r--r-- | ft2.target.linux-arm.mk (renamed from ft2.target.arm.mk) | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ft2.target.arm.mk b/ft2.target.linux-arm.mk index 6e9579d..6ea7437 100644 --- a/ft2.target.arm.mk +++ b/ft2.target.linux-arm.mk @@ -46,6 +46,8 @@ LOCAL_SRC_FILES := \ # Flags passed to both C and C++ files. MY_CFLAGS := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ @@ -70,6 +72,7 @@ MY_CFLAGS := \ -fno-short-enums \ -finline-limit=64 \ -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ -Wno-error=extra \ -Wno-error=ignored-qualifiers \ -Wno-error=type-limits \ @@ -136,6 +139,8 @@ LOCAL_CPPFLAGS := \ ### Rules for final target. LOCAL_LDFLAGS := \ + -Wl,-z,now \ + -Wl,-z,relro \ -Wl,-z,noexecstack \ -fPIC \ -Wl,-z,relro \ |