summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorhenrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-05-15 21:45:09 +0000
committerhenrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-05-15 21:45:09 +0000
commite6c865802af1ce250ed09296c775e783c101635d (patch)
treefd19c99d73ca2521d8ea189daeaa9fc7637cf529 /build
parentb08a9904e693f0c5deeedef60a0a3736bc22dd39 (diff)
downloadwebrtc-e6c865802af1ce250ed09296c775e783c101635d.tar.gz
removed webrtc_base_tests_utils from merge libs as it was breaking some builds.
BUG=N/A R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/18469004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6177 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'build')
-rw-r--r--build/merge_libs.gyp1
1 files changed, 0 insertions, 1 deletions
diff --git a/build/merge_libs.gyp b/build/merge_libs.gyp
index 02f420b7..4f8cdac8 100644
--- a/build/merge_libs.gyp
+++ b/build/merge_libs.gyp
@@ -10,7 +10,6 @@
'includes': ['common.gypi',],
'variables': {
'merge_libs_dependencies': [
- '../base/base_tests.gyp:webrtc_base_tests_utils',
'../webrtc.gyp:webrtc',
],
},