diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-01-02 15:18:05 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-01-02 15:18:05 +0000 |
| commit | 7d6a1e63148e8a8b8fe9c2a48b87ccd12559948f (patch) | |
| tree | 11ce6a42cac734fe20153b4f2eec2ec01baa4d37 | |
| parent | 1773dfea2fd98729e12a9e38f93201a0f76013b0 (diff) | |
| parent | 612b8c2a1ae273223414f8662eb14b24a07cfd79 (diff) | |
| download | freetype-7d6a1e63148e8a8b8fe9c2a48b87ccd12559948f.tar.gz | |
Merge from Chromium at DEPS revision 241107
This commit was generated by merge_to_master.py.
Change-Id: Ib0194cefcfc7eb039e5226b10a6b251777d789d0
| -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, 0 insertions, 12 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index a71c134..b0a87db 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -81,7 +81,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -169,7 +168,6 @@ MY_CFLAGS_Release := \ -fomit-frame-pointer MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index 361d1be..1cced33 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -81,7 +81,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -169,7 +168,6 @@ MY_CFLAGS_Release := \ -fomit-frame-pointer MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 1a01141..dadfc4d 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -83,7 +83,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -174,7 +173,6 @@ MY_CFLAGS_Release := \ -fno-asynchronous-unwind-tables MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index a71c134..b0a87db 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -81,7 +81,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -169,7 +168,6 @@ MY_CFLAGS_Release := \ -fomit-frame-pointer MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 361d1be..1cced33 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -81,7 +81,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -169,7 +168,6 @@ MY_CFLAGS_Release := \ -fomit-frame-pointer MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 1a01141..dadfc4d 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -83,7 +83,6 @@ MY_CFLAGS_Debug := \ -ffunction-sections MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -174,7 +173,6 @@ MY_CFLAGS_Release := \ -fno-asynchronous-unwind-tables MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ |