diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-02-12 16:14:52 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-02-12 16:14:52 +0000 |
| commit | 8c14a93fb15049305837987066b945ccaab14dd1 (patch) | |
| tree | ccd8bddcaa1d52e32977febb8d91d6a450564722 | |
| parent | 62fc6c3771b184b87d645b970ba70c9691dd162c (diff) | |
| download | freetype-8c14a93fb15049305837987066b945ccaab14dd1.tar.gz | |
Update makefiles after merge of Chromium at 250727
This commit was generated by merge_from_chromium.py.
Change-Id: I8c6b1c72f661e28b72549d0364dc59cdc82c6307
| -rw-r--r-- | ft2.target.darwin-arm.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.linux-arm.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 2 |
6 files changed, 12 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index fc76886..c085a68 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -70,6 +70,7 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ @@ -161,6 +162,7 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index 28f57b0..adf74b0 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -70,6 +70,7 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ @@ -161,6 +162,7 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 20aedd9..7499368 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -71,6 +71,7 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -fno-stack-protector \ -Wno-address \ -Wno-format-security \ @@ -163,6 +164,7 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -fno-stack-protector \ -Wno-address \ -Wno-format-security \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index fc76886..c085a68 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -70,6 +70,7 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ @@ -161,6 +162,7 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 28f57b0..adf74b0 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -70,6 +70,7 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ @@ -161,6 +162,7 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 20aedd9..7499368 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -71,6 +71,7 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -fno-stack-protector \ -Wno-address \ -Wno-format-security \ @@ -163,6 +164,7 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -fno-stack-protector \ -Wno-address \ -Wno-format-security \ |