diff options
| -rwxr-xr-x | talk/libjingle.gyp | 2 | ||||
| -rw-r--r-- | talk/libjingle_media_unittest.isolate | 2 | ||||
| -rw-r--r-- | talk/libjingle_p2p_unittest.isolate | 2 | ||||
| -rw-r--r-- | talk/libjingle_peerconnection_unittest.isolate | 2 | ||||
| -rw-r--r-- | talk/libjingle_sound_unittest.isolate | 2 | ||||
| -rw-r--r-- | talk/libjingle_unittest.isolate | 2 | ||||
| -rw-r--r-- | webrtc/video_engine_tests.isolate | 2 | ||||
| -rw-r--r-- | webrtc/webrtc_perf_tests.isolate | 2 |
8 files changed, 1 insertions, 15 deletions
diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp index 9aacdfad6a..2182561e04 100755 --- a/talk/libjingle.gyp +++ b/talk/libjingle.gyp @@ -702,7 +702,7 @@ 'base/scoped_autorelease_pool.mm', ], 'dependencies': [ - '../net/third_party/nss/ssl.gyp:libssl', + '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl', ], 'all_dependent_settings': { 'xcode_settings': { diff --git a/talk/libjingle_media_unittest.isolate b/talk/libjingle_media_unittest.isolate index 36b50b5f3a..78d4600af4 100644 --- a/talk/libjingle_media_unittest.isolate +++ b/talk/libjingle_media_unittest.isolate @@ -29,12 +29,10 @@ ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../testing/test_env.py', '<(PRODUCT_DIR)/libjingle_media_unittest<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ 'media/testdata/captured-320x240-2s-48.frames', - '../testing/test_env.py', '<(PRODUCT_DIR)/libjingle_media_unittest<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ diff --git a/talk/libjingle_p2p_unittest.isolate b/talk/libjingle_p2p_unittest.isolate index b5ad4ff2d8..a2a7844416 100644 --- a/talk/libjingle_p2p_unittest.isolate +++ b/talk/libjingle_p2p_unittest.isolate @@ -29,11 +29,9 @@ ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../testing/test_env.py', '<(PRODUCT_DIR)/libjingle_p2p_unittest<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../testing/test_env.py', '<(PRODUCT_DIR)/libjingle_p2p_unittest<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ diff --git a/talk/libjingle_peerconnection_unittest.isolate b/talk/libjingle_peerconnection_unittest.isolate index e7dd6878a6..6f07013afa 100644 --- a/talk/libjingle_peerconnection_unittest.isolate +++ b/talk/libjingle_peerconnection_unittest.isolate @@ -29,11 +29,9 @@ ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../testing/test_env.py', '<(PRODUCT_DIR)/libjingle_peerconnection_unittest<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../testing/test_env.py', '<(PRODUCT_DIR)/libjingle_peerconnection_unittest<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ diff --git a/talk/libjingle_sound_unittest.isolate b/talk/libjingle_sound_unittest.isolate index 7166337956..7217581b85 100644 --- a/talk/libjingle_sound_unittest.isolate +++ b/talk/libjingle_sound_unittest.isolate @@ -29,11 +29,9 @@ ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../testing/test_env.py', '<(PRODUCT_DIR)/libjingle_sound_unittest<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../testing/test_env.py', '<(PRODUCT_DIR)/libjingle_sound_unittest<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ diff --git a/talk/libjingle_unittest.isolate b/talk/libjingle_unittest.isolate index e678af013e..96d3a99099 100644 --- a/talk/libjingle_unittest.isolate +++ b/talk/libjingle_unittest.isolate @@ -29,11 +29,9 @@ ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../testing/test_env.py', '<(PRODUCT_DIR)/libjingle_unittest<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../testing/test_env.py', '<(PRODUCT_DIR)/libjingle_unittest<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ diff --git a/webrtc/video_engine_tests.isolate b/webrtc/video_engine_tests.isolate index c8ec481e5f..fe319e5890 100644 --- a/webrtc/video_engine_tests.isolate +++ b/webrtc/video_engine_tests.isolate @@ -20,13 +20,11 @@ ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../testing/test_env.py', '<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ '../DEPS', '../resources/foreman_cif_short.yuv', - '../testing/test_env.py', '<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ diff --git a/webrtc/webrtc_perf_tests.isolate b/webrtc/webrtc_perf_tests.isolate index 08f5cbafe6..4ff16735a3 100644 --- a/webrtc/webrtc_perf_tests.isolate +++ b/webrtc/webrtc_perf_tests.isolate @@ -20,7 +20,6 @@ ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ - '../testing/test_env.py', '<(PRODUCT_DIR)/webrtc_perf_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -28,7 +27,6 @@ '../resources/foreman_cif.yuv', '../resources/paris_qcif.yuv', '../resources/voice_engine/audio_long16.pcm', - '../testing/test_env.py', '<(PRODUCT_DIR)/webrtc_perf_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ |