summaryrefslogtreecommitdiff
path: root/voice_engine
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 /voice_engine
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 'voice_engine')
-rw-r--r--voice_engine/voice_engine.target.darwin-arm.mk2
-rw-r--r--voice_engine/voice_engine.target.darwin-arm64.mk2
-rw-r--r--voice_engine/voice_engine.target.darwin-mips.mk2
-rw-r--r--voice_engine/voice_engine.target.darwin-x86.mk2
-rw-r--r--voice_engine/voice_engine.target.darwin-x86_64.mk2
-rw-r--r--voice_engine/voice_engine.target.linux-arm.mk2
-rw-r--r--voice_engine/voice_engine.target.linux-arm64.mk2
-rw-r--r--voice_engine/voice_engine.target.linux-mips.mk2
-rw-r--r--voice_engine/voice_engine.target.linux-x86.mk2
-rw-r--r--voice_engine/voice_engine.target.linux-x86_64.mk2
10 files changed, 20 insertions, 0 deletions
diff --git a/voice_engine/voice_engine.target.darwin-arm.mk b/voice_engine/voice_engine.target.darwin-arm.mk
index b4aa6960..f49d9128 100644
--- a/voice_engine/voice_engine.target.darwin-arm.mk
+++ b/voice_engine/voice_engine.target.darwin-arm.mk
@@ -120,6 +120,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' \
@@ -248,6 +249,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/voice_engine/voice_engine.target.darwin-arm64.mk b/voice_engine/voice_engine.target.darwin-arm64.mk
index 5a5103aa..cc559763 100644
--- a/voice_engine/voice_engine.target.darwin-arm64.mk
+++ b/voice_engine/voice_engine.target.darwin-arm64.mk
@@ -109,6 +109,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' \
@@ -222,6 +223,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/voice_engine/voice_engine.target.darwin-mips.mk b/voice_engine/voice_engine.target.darwin-mips.mk
index 9df43a4c..9dcaf7d4 100644
--- a/voice_engine/voice_engine.target.darwin-mips.mk
+++ b/voice_engine/voice_engine.target.darwin-mips.mk
@@ -113,6 +113,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' \
@@ -233,6 +234,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/voice_engine/voice_engine.target.darwin-x86.mk b/voice_engine/voice_engine.target.darwin-x86.mk
index e56d2950..b3f525c5 100644
--- a/voice_engine/voice_engine.target.darwin-x86.mk
+++ b/voice_engine/voice_engine.target.darwin-x86.mk
@@ -115,6 +115,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' \
@@ -234,6 +235,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/voice_engine/voice_engine.target.darwin-x86_64.mk b/voice_engine/voice_engine.target.darwin-x86_64.mk
index 7e53d7d1..16ee8403 100644
--- a/voice_engine/voice_engine.target.darwin-x86_64.mk
+++ b/voice_engine/voice_engine.target.darwin-x86_64.mk
@@ -114,6 +114,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' \
@@ -232,6 +233,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/voice_engine/voice_engine.target.linux-arm.mk b/voice_engine/voice_engine.target.linux-arm.mk
index b4aa6960..f49d9128 100644
--- a/voice_engine/voice_engine.target.linux-arm.mk
+++ b/voice_engine/voice_engine.target.linux-arm.mk
@@ -120,6 +120,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' \
@@ -248,6 +249,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/voice_engine/voice_engine.target.linux-arm64.mk b/voice_engine/voice_engine.target.linux-arm64.mk
index 5a5103aa..cc559763 100644
--- a/voice_engine/voice_engine.target.linux-arm64.mk
+++ b/voice_engine/voice_engine.target.linux-arm64.mk
@@ -109,6 +109,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' \
@@ -222,6 +223,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/voice_engine/voice_engine.target.linux-mips.mk b/voice_engine/voice_engine.target.linux-mips.mk
index 9df43a4c..9dcaf7d4 100644
--- a/voice_engine/voice_engine.target.linux-mips.mk
+++ b/voice_engine/voice_engine.target.linux-mips.mk
@@ -113,6 +113,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' \
@@ -233,6 +234,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/voice_engine/voice_engine.target.linux-x86.mk b/voice_engine/voice_engine.target.linux-x86.mk
index e56d2950..b3f525c5 100644
--- a/voice_engine/voice_engine.target.linux-x86.mk
+++ b/voice_engine/voice_engine.target.linux-x86.mk
@@ -115,6 +115,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' \
@@ -234,6 +235,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/voice_engine/voice_engine.target.linux-x86_64.mk b/voice_engine/voice_engine.target.linux-x86_64.mk
index 7e53d7d1..16ee8403 100644
--- a/voice_engine/voice_engine.target.linux-x86_64.mk
+++ b/voice_engine/voice_engine.target.linux-x86_64.mk
@@ -114,6 +114,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' \
@@ -232,6 +233,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-05-18 03:41:10 +0000