summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-05-08 04:36:34 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-05-08 04:36:34 +0000
commit232d3d607d6277d928de3c530695561729bc26e8 (patch)
tree946e7fe09086595d571e6bba0e47396195f2bf2c
parent7a80edfc87e6f7615983c9b926d79ea62a3c0229 (diff)
downloadfreetype-232d3d607d6277d928de3c530695561729bc26e8.tar.gz
Update makefiles after merge of Chromium at 269030
This commit was generated by merge_from_chromium.py. Change-Id: Ic199db881007c47091ec58ba06997fc24dd8d3e9
Diffstat
-rw-r--r--ft2.target.darwin-arm.mk4
-rw-r--r--ft2.target.darwin-arm64.mk4
-rw-r--r--ft2.target.darwin-mips.mk4
-rw-r--r--ft2.target.darwin-x86.mk4
-rw-r--r--ft2.target.darwin-x86_64.mk4
-rw-r--r--ft2.target.linux-arm.mk4
-rw-r--r--ft2.target.linux-arm64.mk4
-rw-r--r--ft2.target.linux-mips.mk4
-rw-r--r--ft2.target.linux-x86.mk4
-rw-r--r--ft2.target.linux-x86_64.mk4
10 files changed, 40 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index 4e8aad0..b8e4aad 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -99,6 +99,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -193,6 +195,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ft2.target.darwin-arm64.mk b/ft2.target.darwin-arm64.mk
index 0ccb6b2..44028d0 100644
--- a/ft2.target.darwin-arm64.mk
+++ b/ft2.target.darwin-arm64.mk
@@ -96,6 +96,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -186,6 +188,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index 7bd55fb..5df83be 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -100,6 +100,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -195,6 +197,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index b60a57c..f3008f0 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -100,6 +100,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -194,6 +196,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk
index 64ebca0..4f8795f 100644
--- a/ft2.target.darwin-x86_64.mk
+++ b/ft2.target.darwin-x86_64.mk
@@ -100,6 +100,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -194,6 +196,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index 4e8aad0..b8e4aad 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -99,6 +99,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -193,6 +195,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ft2.target.linux-arm64.mk b/ft2.target.linux-arm64.mk
index 0ccb6b2..44028d0 100644
--- a/ft2.target.linux-arm64.mk
+++ b/ft2.target.linux-arm64.mk
@@ -96,6 +96,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -186,6 +188,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index 7bd55fb..5df83be 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -100,6 +100,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -195,6 +197,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index b60a57c..f3008f0 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -100,6 +100,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -194,6 +196,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
diff --git a/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk
index 64ebca0..4f8795f 100644
--- a/ft2.target.linux-x86_64.mk
+++ b/ft2.target.linux-x86_64.mk
@@ -100,6 +100,8 @@ MY_DEFS_Debug := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -194,6 +196,8 @@ MY_DEFS_Release := \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
+ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
'-DCHROME_PNG_WRITE_SUPPORT' \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 04:40:51 +0000