diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-25 10:30:53 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-25 10:30:53 +0100 |
| commit | 6d86b77056ed63eb6871182f42a9fd5f07550f90 (patch) | |
| tree | 4bd56255660f52e406fbd45083c006cd6ddb2877 /mojo/mojo_system_impl.target.darwin-x86.mk | |
| parent | e9f930807da3850e29ecc641d2becc0403b5709c (diff) | |
| download | chromium_org-6d86b77056ed63eb6871182f42a9fd5f07550f90.tar.gz | |
Merge from Chromium at DEPS revision 278856
This commit was generated by merge_to_master.py.
Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
Diffstat (limited to 'mojo/mojo_system_impl.target.darwin-x86.mk')
| -rw-r--r-- | mojo/mojo_system_impl.target.darwin-x86.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mojo/mojo_system_impl.target.darwin-x86.mk b/mojo/mojo_system_impl.target.darwin-x86.mk index 440214125e..0414dee5bf 100644 --- a/mojo/mojo_system_impl.target.darwin-x86.mk +++ b/mojo/mojo_system_impl.target.darwin-x86.mk @@ -24,6 +24,7 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ + mojo/embedder/channel_init.cc \ mojo/embedder/embedder.cc \ mojo/embedder/platform_channel_pair.cc \ mojo/embedder/platform_channel_pair_posix.cc \ @@ -119,6 +120,7 @@ MY_DEFS_Debug := \ '-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"' \ + '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ '-DMOJO_SYSTEM_IMPL_IMPLEMENTATION' \ '-DMOJO_SYSTEM_IMPLEMENTATION' \ @@ -215,6 +217,7 @@ MY_DEFS_Release := \ '-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"' \ + '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ '-DMOJO_SYSTEM_IMPL_IMPLEMENTATION' \ '-DMOJO_SYSTEM_IMPLEMENTATION' \ |