diff options
| author | henrike@webrtc.org <henrike@webrtc.org> | 2014-10-01 16:33:03 +0000 |
|---|---|---|
| committer | henrike@webrtc.org <henrike@webrtc.org> | 2014-10-01 16:33:03 +0000 |
| commit | bb0131f601b18a6b83df0ca07a71e535852afc3f (patch) | |
| tree | 98586774357e06a452db17e9a9748f980909d1d9 | |
| parent | f719f2032a6764a70583af1d1eaf38716638fdbb (diff) | |
| download | webrtc-bb0131f601b18a6b83df0ca07a71e535852afc3f.tar.gz | |
rtc_unittest: turned sound's test gyp into gypi to speed up GYP generation.
BUG=N/A
R=andrew@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/29629004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7358 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | sound/rtc_sound_unittest.isolate | 25 | ||||
| -rw-r--r-- | sound/sound_tests.gypi (renamed from sound/sound_tests.gyp) | 2 | ||||
| -rw-r--r-- | webrtc.gyp | 2 | ||||
| -rw-r--r-- | webrtc_tests.gypi | 2 |
4 files changed, 3 insertions, 28 deletions
diff --git a/sound/rtc_sound_unittest.isolate b/sound/rtc_sound_unittest.isolate deleted file mode 100644 index 38a2acb1..00000000 --- a/sound/rtc_sound_unittest.isolate +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. - -{ - 'conditions': [ - ['OS=="linux" or OS=="mac" or OS=="win"', { - 'variables': { - 'command': [ - '<(PRODUCT_DIR)/rtc_sound_unittest<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/rtc_sound_unittest<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_untracked': [ - '<(DEPTH)/tools/swarming_client/', - ], - }, - }], - ], -} diff --git a/sound/sound_tests.gyp b/sound/sound_tests.gypi index fbbb4105..a0713c31 100644 --- a/sound/sound_tests.gyp +++ b/sound/sound_tests.gypi @@ -20,4 +20,4 @@ }, ], } - + @@ -9,6 +9,7 @@ 'conditions': [ ['include_tests==1', { 'includes': [ + 'sound/sound_tests.gypi', 'webrtc_tests.gypi', ], }], @@ -45,7 +46,6 @@ 'dependencies': [ 'common_video/common_video_unittests.gyp:*', 'libjingle/xmllite/xmllite_tests.gyp:*', - 'sound/sound_tests.gyp:*', 'system_wrappers/source/system_wrappers_tests.gyp:*', 'test/metrics.gyp:*', 'test/test.gyp:*', diff --git a/webrtc_tests.gypi b/webrtc_tests.gypi index 6def87b4..15e1d1cf 100644 --- a/webrtc_tests.gypi +++ b/webrtc_tests.gypi @@ -14,8 +14,8 @@ 'base/base.gyp:rtc_base', 'base/base_tests.gyp:rtc_base_tests_utils', 'base/base_tests.gyp:rtc_base_tests', + 'rtc_sound_tests', 'sound/sound.gyp:rtc_sound', - 'sound/sound_tests.gyp:rtc_sound_tests', '<(DEPTH)/testing/gtest.gyp:gtest', ], }, |