diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-11-01 15:38:30 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-11-01 15:38:30 +0000 |
| commit | a4649b7993e73d6da9cf42b1b236d0e51d60fd4e (patch) | |
| tree | 3d49c6175dd94f59148fcf490de49ac7ab1cb153 | |
| parent | 0d9f124115431d076c74e7ff6659e91b610387b2 (diff) | |
| download | freetype-a4649b7993e73d6da9cf42b1b236d0e51d60fd4e.tar.gz | |
Update makefiles after merge of Chromium at 232403
This commit was generated by merge_from_chromium.py.
Change-Id: I3e405a8cd2f1ce571b85b4e7433aad03ca50919e
| -rw-r--r-- | ft2.target.darwin-x86.mk | 4 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 855f9ac..590bf5c 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -71,11 +71,11 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -fno-stack-protector \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ -Wno-sequence-point \ - -fno-stack-protector \ -Os \ -g \ -fomit-frame-pointer \ @@ -156,11 +156,11 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -fno-stack-protector \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ -Wno-sequence-point \ - -fno-stack-protector \ -Os \ -fno-ident \ -fdata-sections \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 855f9ac..590bf5c 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -71,11 +71,11 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -fno-stack-protector \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ -Wno-sequence-point \ - -fno-stack-protector \ -Os \ -g \ -fomit-frame-pointer \ @@ -156,11 +156,11 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -fno-stack-protector \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ -Wno-sequence-point \ - -fno-stack-protector \ -Os \ -fno-ident \ -fdata-sections \ |