Create a copy of talk/sound under webrtc/sound.

BUG=3379 R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/22379004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6986 4adac7df-926f-26a2-2b94-8c16560cd09d
GetStream · Aug 26, 2014 · 66a3582 · 66a3582
1 parent 7087857
commit 66a3582
Show file tree

Hide file tree

Showing 35 changed files with 4,097 additions and 2 deletions.
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
@@ -29,7 +29,6 @@
       'type': 'static_library',
       'defines': [
         'FEATURE_ENABLE_SSL',
-        'GTEST_RELATIVE_PATH',
         'LOGGING=1',
         'USE_WEBRTC_DEV_BRANCH',
       ],
@@ -332,7 +331,6 @@
         ],
         'defines': [
           'FEATURE_ENABLE_SSL',
-          'GTEST_RELATIVE_PATH',
         ],
       },
       'include_dirs': [

diff --git a/webrtc/base/base_tests.gyp b/webrtc/base/base_tests.gyp
@@ -25,10 +25,18 @@
         'testutils.h',
         'win32toolhelp.h',
       ],
+      'defines': [
+        'GTEST_RELATIVE_PATH',
+      ],
       'dependencies': [
         'base.gyp:webrtc_base',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
+      'direct_dependent_settings': {
+        'defines': [
+          'GTEST_RELATIVE_PATH',
+        ],
+      },
       'export_dependent_settings': [
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],

diff --git a/webrtc/build/merge_libs.gyp b/webrtc/build/merge_libs.gyp
@@ -11,6 +11,7 @@
   'variables': {
     'merge_libs_dependencies': [
       '../webrtc.gyp:webrtc',
+      '../sound/sound.gyp:rtc_sound',
     ],
   },
   'targets': [