From 612b8c2a1ae273223414f8662eb14b24a07cfd79 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Thu, 2 Jan 2014 15:10:31 +0000 Subject: Update makefiles after merge of Chromium at 241107 This commit was generated by merge_from_chromium.py. Change-Id: Ic9352c5ae55fbe14aabb7114f562e6bf88b5aa51 --- ft2.target.darwin-arm.mk | 2 -- ft2.target.darwin-mips.mk | 2 -- ft2.target.darwin-x86.mk | 2 -- ft2.target.linux-arm.mk | 2 -- ft2.target.linux-mips.mk | 2 -- ft2.target.linux-x86.mk | 2 -- 6 files changed, 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' \ -- cgit v1.2.3 From bced1aa69028e91c93e6b225be846a46d1675673 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Thu, 23 Jan 2014 21:37:51 +0000 Subject: Update makefiles after merge of Chromium at 33.0.1750.46 This commit was generated by merge_from_chromium.py. Change-Id: I39e62f36f34753bf70cbbe2f7fb60f258f5a7854 --- ft2.target.darwin-arm.mk | 12 +++++++++++- ft2.target.darwin-mips.mk | 12 +++++++++++- ft2.target.darwin-x86.mk | 12 +++++++++++- ft2.target.linux-arm.mk | 12 +++++++++++- ft2.target.linux-mips.mk | 12 +++++++++++- ft2.target.linux-x86.mk | 12 +++++++++++- 6 files changed, 66 insertions(+), 6 deletions(-) diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index b0a87db..1207044 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -28,12 +28,12 @@ LOCAL_SRC_FILES := \ third_party/freetype/src/base/ftglyph.c \ third_party/freetype/src/base/ftlcdfil.c \ third_party/freetype/src/base/ftstroke.c \ + third_party/freetype/src/base/fttype1.c \ third_party/freetype/src/base/ftxf86.c \ third_party/freetype/src/base/ftbase.c \ third_party/freetype/src/base/ftsystem.c \ third_party/freetype/src/base/ftinit.c \ third_party/freetype/src/base/ftgasp.c \ - third_party/freetype/src/base/fttype1.c \ third_party/freetype/src/raster/raster.c \ third_party/freetype/src/sfnt/sfnt.c \ third_party/freetype/src/smooth/smooth.c \ @@ -99,6 +99,9 @@ MY_DEFS_Debug := \ '-DENABLE_MANAGED_USERS=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ + '-DCHROME_PNG_WRITE_SUPPORT' \ + '-DPNG_USER_CONFIG' \ + '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -113,6 +116,8 @@ MY_DEFS_Debug := \ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ + $(LOCAL_PATH)/third_party/libpng \ + $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -186,6 +191,9 @@ MY_DEFS_Release := \ '-DENABLE_MANAGED_USERS=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ + '-DCHROME_PNG_WRITE_SUPPORT' \ + '-DPNG_USER_CONFIG' \ + '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -200,6 +208,8 @@ MY_DEFS_Release := \ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ + $(LOCAL_PATH)/third_party/libpng \ + $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index 1cced33..717adae 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -28,12 +28,12 @@ LOCAL_SRC_FILES := \ third_party/freetype/src/base/ftglyph.c \ third_party/freetype/src/base/ftlcdfil.c \ third_party/freetype/src/base/ftstroke.c \ + third_party/freetype/src/base/fttype1.c \ third_party/freetype/src/base/ftxf86.c \ third_party/freetype/src/base/ftbase.c \ third_party/freetype/src/base/ftsystem.c \ third_party/freetype/src/base/ftinit.c \ third_party/freetype/src/base/ftgasp.c \ - third_party/freetype/src/base/fttype1.c \ third_party/freetype/src/raster/raster.c \ third_party/freetype/src/sfnt/sfnt.c \ third_party/freetype/src/smooth/smooth.c \ @@ -99,6 +99,9 @@ MY_DEFS_Debug := \ '-DENABLE_MANAGED_USERS=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ + '-DCHROME_PNG_WRITE_SUPPORT' \ + '-DPNG_USER_CONFIG' \ + '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -113,6 +116,8 @@ MY_DEFS_Debug := \ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ + $(LOCAL_PATH)/third_party/libpng \ + $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -186,6 +191,9 @@ MY_DEFS_Release := \ '-DENABLE_MANAGED_USERS=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ + '-DCHROME_PNG_WRITE_SUPPORT' \ + '-DPNG_USER_CONFIG' \ + '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -200,6 +208,8 @@ MY_DEFS_Release := \ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ + $(LOCAL_PATH)/third_party/libpng \ + $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index dadfc4d..f6b417c 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -28,12 +28,12 @@ LOCAL_SRC_FILES := \ third_party/freetype/src/base/ftglyph.c \ third_party/freetype/src/base/ftlcdfil.c \ third_party/freetype/src/base/ftstroke.c \ + third_party/freetype/src/base/fttype1.c \ third_party/freetype/src/base/ftxf86.c \ third_party/freetype/src/base/ftbase.c \ third_party/freetype/src/base/ftsystem.c \ third_party/freetype/src/base/ftinit.c \ third_party/freetype/src/base/ftgasp.c \ - third_party/freetype/src/base/fttype1.c \ third_party/freetype/src/raster/raster.c \ third_party/freetype/src/sfnt/sfnt.c \ third_party/freetype/src/smooth/smooth.c \ @@ -101,6 +101,9 @@ MY_DEFS_Debug := \ '-DENABLE_MANAGED_USERS=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ + '-DCHROME_PNG_WRITE_SUPPORT' \ + '-DPNG_USER_CONFIG' \ + '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -115,6 +118,8 @@ MY_DEFS_Debug := \ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ + $(LOCAL_PATH)/third_party/libpng \ + $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -191,6 +196,9 @@ MY_DEFS_Release := \ '-DENABLE_MANAGED_USERS=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ + '-DCHROME_PNG_WRITE_SUPPORT' \ + '-DPNG_USER_CONFIG' \ + '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -205,6 +213,8 @@ MY_DEFS_Release := \ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ + $(LOCAL_PATH)/third_party/libpng \ + $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index b0a87db..1207044 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -28,12 +28,12 @@ LOCAL_SRC_FILES := \ third_party/freetype/src/base/ftglyph.c \ third_party/freetype/src/base/ftlcdfil.c \ third_party/freetype/src/base/ftstroke.c \ + third_party/freetype/src/base/fttype1.c \ third_party/freetype/src/base/ftxf86.c \ third_party/freetype/src/base/ftbase.c \ third_party/freetype/src/base/ftsystem.c \ third_party/freetype/src/base/ftinit.c \ third_party/freetype/src/base/ftgasp.c \ - third_party/freetype/src/base/fttype1.c \ third_party/freetype/src/raster/raster.c \ third_party/freetype/src/sfnt/sfnt.c \ third_party/freetype/src/smooth/smooth.c \ @@ -99,6 +99,9 @@ MY_DEFS_Debug := \ '-DENABLE_MANAGED_USERS=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ + '-DCHROME_PNG_WRITE_SUPPORT' \ + '-DPNG_USER_CONFIG' \ + '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -113,6 +116,8 @@ MY_DEFS_Debug := \ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ + $(LOCAL_PATH)/third_party/libpng \ + $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -186,6 +191,9 @@ MY_DEFS_Release := \ '-DENABLE_MANAGED_USERS=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ + '-DCHROME_PNG_WRITE_SUPPORT' \ + '-DPNG_USER_CONFIG' \ + '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -200,6 +208,8 @@ MY_DEFS_Release := \ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ + $(LOCAL_PATH)/third_party/libpng \ + $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 1cced33..717adae 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -28,12 +28,12 @@ LOCAL_SRC_FILES := \ third_party/freetype/src/base/ftglyph.c \ third_party/freetype/src/base/ftlcdfil.c \ third_party/freetype/src/base/ftstroke.c \ + third_party/freetype/src/base/fttype1.c \ third_party/freetype/src/base/ftxf86.c \ third_party/freetype/src/base/ftbase.c \ third_party/freetype/src/base/ftsystem.c \ third_party/freetype/src/base/ftinit.c \ third_party/freetype/src/base/ftgasp.c \ - third_party/freetype/src/base/fttype1.c \ third_party/freetype/src/raster/raster.c \ third_party/freetype/src/sfnt/sfnt.c \ third_party/freetype/src/smooth/smooth.c \ @@ -99,6 +99,9 @@ MY_DEFS_Debug := \ '-DENABLE_MANAGED_USERS=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ + '-DCHROME_PNG_WRITE_SUPPORT' \ + '-DPNG_USER_CONFIG' \ + '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -113,6 +116,8 @@ MY_DEFS_Debug := \ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ + $(LOCAL_PATH)/third_party/libpng \ + $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -186,6 +191,9 @@ MY_DEFS_Release := \ '-DENABLE_MANAGED_USERS=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ + '-DCHROME_PNG_WRITE_SUPPORT' \ + '-DPNG_USER_CONFIG' \ + '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -200,6 +208,8 @@ MY_DEFS_Release := \ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ + $(LOCAL_PATH)/third_party/libpng \ + $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index dadfc4d..f6b417c 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -28,12 +28,12 @@ LOCAL_SRC_FILES := \ third_party/freetype/src/base/ftglyph.c \ third_party/freetype/src/base/ftlcdfil.c \ third_party/freetype/src/base/ftstroke.c \ + third_party/freetype/src/base/fttype1.c \ third_party/freetype/src/base/ftxf86.c \ third_party/freetype/src/base/ftbase.c \ third_party/freetype/src/base/ftsystem.c \ third_party/freetype/src/base/ftinit.c \ third_party/freetype/src/base/ftgasp.c \ - third_party/freetype/src/base/fttype1.c \ third_party/freetype/src/raster/raster.c \ third_party/freetype/src/sfnt/sfnt.c \ third_party/freetype/src/smooth/smooth.c \ @@ -101,6 +101,9 @@ MY_DEFS_Debug := \ '-DENABLE_MANAGED_USERS=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ + '-DCHROME_PNG_WRITE_SUPPORT' \ + '-DPNG_USER_CONFIG' \ + '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -115,6 +118,8 @@ MY_DEFS_Debug := \ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ + $(LOCAL_PATH)/third_party/libpng \ + $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -191,6 +196,9 @@ MY_DEFS_Release := \ '-DENABLE_MANAGED_USERS=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ + '-DCHROME_PNG_WRITE_SUPPORT' \ + '-DPNG_USER_CONFIG' \ + '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -205,6 +213,8 @@ MY_DEFS_Release := \ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ + $(LOCAL_PATH)/third_party/libpng \ + $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport -- cgit v1.2.3 From 01cb7c7f75d3b98feb1d66638a6a427a24130869 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Tue, 27 May 2014 12:14:39 +0100 Subject: Update makefiles after merge of Chromium at 36.0.1985.18 This commit was generated by merge_from_chromium.py. Change-Id: I96b2e4fc84b3fc9f49ff134db5d516ed16c0eb12 --- ft2.target.darwin-arm.mk | 8 ++++++++ ft2.target.darwin-arm64.mk | 8 ++++++++ ft2.target.darwin-mips.mk | 8 ++++++++ ft2.target.darwin-x86.mk | 8 ++++++++ ft2.target.darwin-x86_64.mk | 8 ++++++++ ft2.target.linux-arm.mk | 8 ++++++++ ft2.target.linux-arm64.mk | 8 ++++++++ ft2.target.linux-mips.mk | 8 ++++++++ ft2.target.linux-x86.mk | 8 ++++++++ ft2.target.linux-x86_64.mk | 8 ++++++++ 10 files changed, 80 insertions(+) diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index c7c9a00..4c397d6 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -99,6 +99,10 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ @@ -194,6 +198,10 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ diff --git a/ft2.target.darwin-arm64.mk b/ft2.target.darwin-arm64.mk index afc2251..0cdcfb4 100644 --- a/ft2.target.darwin-arm64.mk +++ b/ft2.target.darwin-arm64.mk @@ -96,6 +96,10 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ @@ -187,6 +191,10 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index ce436e8..a3ad32b 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -100,6 +100,10 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ @@ -196,6 +200,10 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 8b12d05..5ddff96 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -100,6 +100,10 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ @@ -195,6 +199,10 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk index 8d7c98b..8725fcc 100644 --- a/ft2.target.darwin-x86_64.mk +++ b/ft2.target.darwin-x86_64.mk @@ -100,6 +100,10 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ @@ -195,6 +199,10 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index c7c9a00..4c397d6 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -99,6 +99,10 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ @@ -194,6 +198,10 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ diff --git a/ft2.target.linux-arm64.mk b/ft2.target.linux-arm64.mk index afc2251..0cdcfb4 100644 --- a/ft2.target.linux-arm64.mk +++ b/ft2.target.linux-arm64.mk @@ -96,6 +96,10 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ @@ -187,6 +191,10 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index ce436e8..a3ad32b 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -100,6 +100,10 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ @@ -196,6 +200,10 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 8b12d05..5ddff96 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -100,6 +100,10 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ @@ -195,6 +199,10 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ diff --git a/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk index 8d7c98b..8725fcc 100644 --- a/ft2.target.linux-x86_64.mk +++ b/ft2.target.linux-x86_64.mk @@ -100,6 +100,10 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ @@ -195,6 +199,10 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ + '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ -- cgit v1.2.3