Adds a modified copy of talk/base to webrtc/base. It is the first step in migrating talk/base to webrtc/base.

BUG=N/A R=andrew@webrtc.org, wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/12199004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6107 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-12 18:03:09 +00:00
parent f3a5e6afc4
commit 2c7d1b39b9
386 changed files with 84973 additions and 6 deletions
--- a/webrtc/build/merge_libs.gyp
+++ b/webrtc/build/merge_libs.gyp
@ -10,6 +10,7 @@
  'includes': ['common.gypi',],
  'variables': {
    'merge_libs_dependencies': [
+      '../base/base_tests.gyp:webrtc_base_tests_utils',
      '../webrtc.gyp:webrtc',
    ],
  },