diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-03-11 14:10:23 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-03-11 14:10:23 +0000 |
| commit | 9710b66b7997a477ba07cb1f4405e46a2ed85f55 (patch) | |
| tree | 64e7df2c052095ed8cf5ea10639fa72d6fdc3d37 /ft2.target.darwin-x86.mk | |
| parent | 005c002e2cfc6b2863cc423ac60f859eb01950cd (diff) | |
| download | freetype-9710b66b7997a477ba07cb1f4405e46a2ed85f55.tar.gz | |
Update makefiles after merge of Chromium at r187292
This commit was generated by merge_from_chromium.py.
Change-Id: I239c00ce1f4f867c8b28aa0c69fcbc7866845720
Diffstat (limited to 'ft2.target.darwin-x86.mk')
| -rw-r--r-- | ft2.target.darwin-x86.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index a08a80a..926a75c 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -70,11 +70,8 @@ MY_CFLAGS := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ - -Wno-non-virtual-dtor \ - -Wno-sign-promo \ -Wno-address \ -Wno-format-security \ - -Wno-non-virtual-dtor \ -Wno-return-type \ -Wno-sequence-point \ -fno-stack-protector \ @@ -129,7 +126,10 @@ LOCAL_CPPFLAGS := \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ -Wno-deprecated \ - -Wno-error=c++0x-compat + -Wno-error=c++0x-compat \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor ### Rules for final target. |