summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-09-08 19:00:33 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-09-08 19:00:33 +0000
commitcb45b28423b9c22974e440af3224efe1a68bace5 (patch)
tree0dc3359a63be3c68616dcb7ac6e3f6eaecb899ef /base
parentf1234f3b2a2d141572c99ff1b83227ebd38de29e (diff)
downloadwebrtc-cb45b28423b9c22974e440af3224efe1a68bace5.tar.gz
Update makefiles after merge of Chromium at 041843cbf814
This commit was generated by merge_from_chromium.py. Change-Id: Ib50e00ed5e94f0daf8eefe82b049a93bc3f416ef
Diffstat (limited to 'base')
-rw-r--r--base/webrtc_base.target.darwin-arm.mk2
-rw-r--r--base/webrtc_base.target.darwin-arm64.mk2
-rw-r--r--base/webrtc_base.target.darwin-mips.mk2
-rw-r--r--base/webrtc_base.target.darwin-x86.mk2
-rw-r--r--base/webrtc_base.target.darwin-x86_64.mk2
-rw-r--r--base/webrtc_base.target.linux-arm.mk2
-rw-r--r--base/webrtc_base.target.linux-arm64.mk2
-rw-r--r--base/webrtc_base.target.linux-mips.mk2
-rw-r--r--base/webrtc_base.target.linux-x86.mk2
-rw-r--r--base/webrtc_base.target.linux-x86_64.mk2
10 files changed, 20 insertions, 0 deletions
diff --git a/base/webrtc_base.target.darwin-arm.mk b/base/webrtc_base.target.darwin-arm.mk
index abb4e355..0dbffc2c 100644
--- a/base/webrtc_base.target.darwin-arm.mk
+++ b/base/webrtc_base.target.darwin-arm.mk
@@ -166,6 +166,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
@@ -293,6 +294,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
diff --git a/base/webrtc_base.target.darwin-arm64.mk b/base/webrtc_base.target.darwin-arm64.mk
index 35ba5e83..6b0605d5 100644
--- a/base/webrtc_base.target.darwin-arm64.mk
+++ b/base/webrtc_base.target.darwin-arm64.mk
@@ -155,6 +155,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
@@ -267,6 +268,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
diff --git a/base/webrtc_base.target.darwin-mips.mk b/base/webrtc_base.target.darwin-mips.mk
index 3441f9d0..61b71892 100644
--- a/base/webrtc_base.target.darwin-mips.mk
+++ b/base/webrtc_base.target.darwin-mips.mk
@@ -159,6 +159,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
@@ -278,6 +279,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
diff --git a/base/webrtc_base.target.darwin-x86.mk b/base/webrtc_base.target.darwin-x86.mk
index 4e541af2..65427a6f 100644
--- a/base/webrtc_base.target.darwin-x86.mk
+++ b/base/webrtc_base.target.darwin-x86.mk
@@ -161,6 +161,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
@@ -279,6 +280,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
diff --git a/base/webrtc_base.target.darwin-x86_64.mk b/base/webrtc_base.target.darwin-x86_64.mk
index 264413c7..8381013b 100644
--- a/base/webrtc_base.target.darwin-x86_64.mk
+++ b/base/webrtc_base.target.darwin-x86_64.mk
@@ -160,6 +160,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
@@ -277,6 +278,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
diff --git a/base/webrtc_base.target.linux-arm.mk b/base/webrtc_base.target.linux-arm.mk
index abb4e355..0dbffc2c 100644
--- a/base/webrtc_base.target.linux-arm.mk
+++ b/base/webrtc_base.target.linux-arm.mk
@@ -166,6 +166,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
@@ -293,6 +294,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
diff --git a/base/webrtc_base.target.linux-arm64.mk b/base/webrtc_base.target.linux-arm64.mk
index 35ba5e83..6b0605d5 100644
--- a/base/webrtc_base.target.linux-arm64.mk
+++ b/base/webrtc_base.target.linux-arm64.mk
@@ -155,6 +155,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
@@ -267,6 +268,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
diff --git a/base/webrtc_base.target.linux-mips.mk b/base/webrtc_base.target.linux-mips.mk
index 3441f9d0..61b71892 100644
--- a/base/webrtc_base.target.linux-mips.mk
+++ b/base/webrtc_base.target.linux-mips.mk
@@ -159,6 +159,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
@@ -278,6 +279,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
diff --git a/base/webrtc_base.target.linux-x86.mk b/base/webrtc_base.target.linux-x86.mk
index 4e541af2..65427a6f 100644
--- a/base/webrtc_base.target.linux-x86.mk
+++ b/base/webrtc_base.target.linux-x86.mk
@@ -161,6 +161,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
@@ -279,6 +280,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
diff --git a/base/webrtc_base.target.linux-x86_64.mk b/base/webrtc_base.target.linux-x86_64.mk
index 264413c7..8381013b 100644
--- a/base/webrtc_base.target.linux-x86_64.mk
+++ b/base/webrtc_base.target.linux-x86_64.mk
@@ -160,6 +160,7 @@ MY_DEFS_Debug := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
@@ -277,6 +278,7 @@ MY_DEFS_Release := \
'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
+ '-DEXPAT_RELATIVE_PATH' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
'-DWEBRTC_CHROMIUM_BUILD' \
'-DLOGGING_INSIDE_WEBRTC' \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 15:19:11 +0000