diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-09-10 03:33:05 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-09-10 03:33:05 +0000 |
| commit | 037d14dba23a47e64df0cb621e2c68dba386fb8e (patch) | |
| tree | 6f2ac3725dc7051e0d249f45dfab66ce2894814b /libjingle/xmllite | |
| parent | 0889e2e637af905e46b32b7d69847def0f297fca (diff) | |
| download | webrtc-037d14dba23a47e64df0cb621e2c68dba386fb8e.tar.gz | |
Update makefiles after merge of Chromium at a301aef21f9e
This commit was generated by merge_from_chromium.py.
Change-Id: I44df4fe3b2e608a292d12afc442eb8e98952bd4e
Diffstat (limited to 'libjingle/xmllite')
10 files changed, 20 insertions, 0 deletions
diff --git a/libjingle/xmllite/rtc_xmllite.target.darwin-arm.mk b/libjingle/xmllite/rtc_xmllite.target.darwin-arm.mk index e6c82a46..0c8596f5 100644 --- a/libjingle/xmllite/rtc_xmllite.target.darwin-arm.mk +++ b/libjingle/xmllite/rtc_xmllite.target.darwin-arm.mk @@ -102,6 +102,7 @@ MY_DEFS_Debug := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -229,6 +230,7 @@ MY_DEFS_Release := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/libjingle/xmllite/rtc_xmllite.target.darwin-arm64.mk b/libjingle/xmllite/rtc_xmllite.target.darwin-arm64.mk index 8bc253fe..2c333db2 100644 --- a/libjingle/xmllite/rtc_xmllite.target.darwin-arm64.mk +++ b/libjingle/xmllite/rtc_xmllite.target.darwin-arm64.mk @@ -91,6 +91,7 @@ MY_DEFS_Debug := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -203,6 +204,7 @@ MY_DEFS_Release := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/libjingle/xmllite/rtc_xmllite.target.darwin-mips.mk b/libjingle/xmllite/rtc_xmllite.target.darwin-mips.mk index 047668b0..1c17291a 100644 --- a/libjingle/xmllite/rtc_xmllite.target.darwin-mips.mk +++ b/libjingle/xmllite/rtc_xmllite.target.darwin-mips.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -214,6 +215,7 @@ MY_DEFS_Release := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/libjingle/xmllite/rtc_xmllite.target.darwin-x86.mk b/libjingle/xmllite/rtc_xmllite.target.darwin-x86.mk index 6a8434f9..addb5b00 100644 --- a/libjingle/xmllite/rtc_xmllite.target.darwin-x86.mk +++ b/libjingle/xmllite/rtc_xmllite.target.darwin-x86.mk @@ -97,6 +97,7 @@ MY_DEFS_Debug := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -215,6 +216,7 @@ MY_DEFS_Release := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/libjingle/xmllite/rtc_xmllite.target.darwin-x86_64.mk b/libjingle/xmllite/rtc_xmllite.target.darwin-x86_64.mk index dbcdfd81..c428950e 100644 --- a/libjingle/xmllite/rtc_xmllite.target.darwin-x86_64.mk +++ b/libjingle/xmllite/rtc_xmllite.target.darwin-x86_64.mk @@ -96,6 +96,7 @@ MY_DEFS_Debug := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -213,6 +214,7 @@ MY_DEFS_Release := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/libjingle/xmllite/rtc_xmllite.target.linux-arm.mk b/libjingle/xmllite/rtc_xmllite.target.linux-arm.mk index e6c82a46..0c8596f5 100644 --- a/libjingle/xmllite/rtc_xmllite.target.linux-arm.mk +++ b/libjingle/xmllite/rtc_xmllite.target.linux-arm.mk @@ -102,6 +102,7 @@ MY_DEFS_Debug := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -229,6 +230,7 @@ MY_DEFS_Release := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/libjingle/xmllite/rtc_xmllite.target.linux-arm64.mk b/libjingle/xmllite/rtc_xmllite.target.linux-arm64.mk index 8bc253fe..2c333db2 100644 --- a/libjingle/xmllite/rtc_xmllite.target.linux-arm64.mk +++ b/libjingle/xmllite/rtc_xmllite.target.linux-arm64.mk @@ -91,6 +91,7 @@ MY_DEFS_Debug := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -203,6 +204,7 @@ MY_DEFS_Release := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/libjingle/xmllite/rtc_xmllite.target.linux-mips.mk b/libjingle/xmllite/rtc_xmllite.target.linux-mips.mk index 047668b0..1c17291a 100644 --- a/libjingle/xmllite/rtc_xmllite.target.linux-mips.mk +++ b/libjingle/xmllite/rtc_xmllite.target.linux-mips.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -214,6 +215,7 @@ MY_DEFS_Release := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/libjingle/xmllite/rtc_xmllite.target.linux-x86.mk b/libjingle/xmllite/rtc_xmllite.target.linux-x86.mk index 6a8434f9..addb5b00 100644 --- a/libjingle/xmllite/rtc_xmllite.target.linux-x86.mk +++ b/libjingle/xmllite/rtc_xmllite.target.linux-x86.mk @@ -97,6 +97,7 @@ MY_DEFS_Debug := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -215,6 +216,7 @@ MY_DEFS_Release := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ diff --git a/libjingle/xmllite/rtc_xmllite.target.linux-x86_64.mk b/libjingle/xmllite/rtc_xmllite.target.linux-x86_64.mk index dbcdfd81..c428950e 100644 --- a/libjingle/xmllite/rtc_xmllite.target.linux-x86_64.mk +++ b/libjingle/xmllite/rtc_xmllite.target.linux-x86_64.mk @@ -96,6 +96,7 @@ MY_DEFS_Debug := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ @@ -213,6 +214,7 @@ MY_DEFS_Release := \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DWEBRTC_RESTRICT_LOGGING' \ '-DEXPAT_RELATIVE_PATH' \ '-DWEBRTC_MODULE_UTILITY_VIDEO' \ |