summaryrefslogtreecommitdiff
path: root/system_wrappers/source
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-09-16 12:34:41 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-09-16 12:34:41 +0000
commit741367cc650318127779145a68f4154b5aca8709 (patch)
treea044a7cd182a2dc5decaf635bd9c9932ac1733d3 /system_wrappers/source
parent2a597ca5080bf78201031566884d52e30f725c70 (diff)
parent34374d1ea3f56216836788b7378c69a540fe9197 (diff)
downloadwebrtc-741367cc650318127779145a68f4154b5aca8709.tar.gz
Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at 34374d1ea3f56216836788b7378c69a540fe9197
This commit was generated by merge_from_chromium.py. Change-Id: Ie01094518bf66b1482b596f901b6466d23bc353e
Diffstat (limited to 'system_wrappers/source')
-rw-r--r--system_wrappers/source/system_wrappers.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/system_wrappers/source/system_wrappers.gyp b/system_wrappers/source/system_wrappers.gyp
index 610f6b08..82addeb5 100644
--- a/system_wrappers/source/system_wrappers.gyp
+++ b/system_wrappers/source/system_wrappers.gyp
@@ -17,7 +17,7 @@
'../interface',
],
'dependencies': [
- '../../base/base.gyp:rtc_base',
+ '../../base/base.gyp:rtc_base_approved',
],
'direct_dependent_settings': {
'include_dirs': [