diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-05-23 18:41:03 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-05-23 18:41:03 +0000 |
commit | 1b75e9f56d1465d6af086b17cdf270b44ca3502f (patch) | |
tree | 0ee6578ad2e712760363e6dd2c9f8b242cebfdf3 | |
parent | 986ff784656ffcbc180d3126df19dd2620450597 (diff) | |
download | freetype-1b75e9f56d1465d6af086b17cdf270b44ca3502f.tar.gz |
Update makefiles after merge of Chromium at 272566
This commit was generated by merge_from_chromium.py.
Change-Id: Ia33ce1e6c62f473a6757d90ffe5d5f7008e095f8
-rw-r--r-- | ft2.target.darwin-arm.mk | 2 | ||||
-rw-r--r-- | ft2.target.darwin-arm64.mk | 2 | ||||
-rw-r--r-- | ft2.target.darwin-mips.mk | 2 | ||||
-rw-r--r-- | ft2.target.darwin-x86.mk | 2 | ||||
-rw-r--r-- | ft2.target.darwin-x86_64.mk | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index 1e2c746..f4ed6c9 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -56,6 +56,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -Wno-format \ -fno-tree-sra \ -fno-partial-inlining \ @@ -161,6 +162,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -Wno-format \ -fno-tree-sra \ -fno-partial-inlining \ diff --git a/ft2.target.darwin-arm64.mk b/ft2.target.darwin-arm64.mk index f2b6af3..0cdcfb4 100644 --- a/ft2.target.darwin-arm64.mk +++ b/ft2.target.darwin-arm64.mk @@ -55,6 +55,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -Wno-format \ -ffunction-sections \ -funwind-tables \ @@ -149,6 +150,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -Wno-format \ -ffunction-sections \ -funwind-tables \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index a3ad32b..3349c05 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -57,6 +57,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -Wno-format \ -EL \ -mhard-float \ @@ -157,6 +158,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -Wno-format \ -EL \ -mhard-float \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 5ddff96..2a8654e 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -55,6 +55,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -Wno-format \ -msse2 \ -mfpmath=sse \ @@ -154,6 +155,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -Wno-format \ -msse2 \ -mfpmath=sse \ diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk index 50afb68..8725fcc 100644 --- a/ft2.target.darwin-x86_64.mk +++ b/ft2.target.darwin-x86_64.mk @@ -56,6 +56,7 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -Wno-format \ -m64 \ -march=x86-64 \ @@ -154,6 +155,7 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ + -Wno-unused-local-typedefs \ -Wno-format \ -m64 \ -march=x86-64 \ |