diff options
21 files changed, 171 insertions, 83 deletions
diff --git a/common_audio/common_audio_unittests.isolate b/common_audio/common_audio_unittests.isolate index 7eedcd7a..e6b1db6e 100644 --- a/common_audio/common_audio_unittests.isolate +++ b/common_audio/common_audio_unittests.isolate @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { 'conditions': [ + ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. + 'variables': { + 'isolate_dependency_untracked': [ + '../../../data/', + '../../../resources/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ diff --git a/common_video/common_video_unittests.isolate b/common_video/common_video_unittests.isolate index f173ff7a..e96645a8 100644 --- a/common_video/common_video_unittests.isolate +++ b/common_video/common_video_unittests.isolate @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { 'conditions': [ + ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. + 'variables': { + 'isolate_dependency_untracked': [ + '../../../data/', + '../../../resources/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ diff --git a/modules/audio_coding/neteq/neteq_unittests.isolate b/modules/audio_coding/neteq/neteq_unittests.isolate index a2c06136..78d805cc 100644 --- a/modules/audio_coding/neteq/neteq_unittests.isolate +++ b/modules/audio_coding/neteq/neteq_unittests.isolate @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { 'conditions': [ + ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. + 'variables': { + 'isolate_dependency_untracked': [ + '../../../../../data/', + '../../../../../resources/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ diff --git a/modules/audio_coding/neteq4/audio_decoder_unittests.isolate b/modules/audio_coding/neteq4/audio_decoder_unittests.isolate index 33c4a4b9..63177801 100644 --- a/modules/audio_coding/neteq4/audio_decoder_unittests.isolate +++ b/modules/audio_coding/neteq4/audio_decoder_unittests.isolate @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { 'conditions': [ + ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. + 'variables': { + 'isolate_dependency_untracked': [ + '../../../../../resources/', + '../../../../../data/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ diff --git a/modules/audio_device/audio_device_test_api.isolate b/modules/audio_device/audio_device_test_api.isolate deleted file mode 100644 index ec04929f..00000000 --- a/modules/audio_device/audio_device_test_api.isolate +++ /dev/null @@ -1,27 +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': [ - '../../../testing/test_env.py', - '../../../tools/swarm_client/googletest/run_test_cases.py', - '<(PRODUCT_DIR)/audio_device_test_api<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_tracked': [ - '../../../testing/test_env.py', - '../../../tools/swarm_client/run_isolated.py', - '../../../tools/swarm_client/googletest/run_test_cases.py', - '../../../tools/swarm_client/third_party/upload.py', - '<(PRODUCT_DIR)/audio_device_test_api<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/modules/audio_device/audio_device_tests.isolate b/modules/audio_device/audio_device_tests.isolate index 65b1b06c..38b397f5 100644 --- a/modules/audio_device/audio_device_tests.isolate +++ b/modules/audio_device/audio_device_tests.isolate @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { 'conditions': [ + ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. + 'variables': { + 'isolate_dependency_untracked': [ + '../../../../data/', + '../../../../resources/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ diff --git a/modules/modules_tests.isolate b/modules/modules_tests.isolate index 36eb446e..a473720e 100644 --- a/modules/modules_tests.isolate +++ b/modules/modules_tests.isolate @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { 'conditions': [ + ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. + 'variables': { + 'isolate_dependency_untracked': [ + '../../../data/', + '../../../resources/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ @@ -20,7 +30,7 @@ '../../resources/audio_coding/teststereo32kHz.pcm', '../../resources/foreman_cif.yuv', '../../resources/paris_qcif.yuv', - '../../testing/test_env.py', + '../../testing/test_env.py', '../../tools/swarm_client/run_isolated.py', '../../tools/swarm_client/googletest/run_test_cases.py', '../../tools/swarm_client/third_party/upload.py', diff --git a/modules/modules_unittests.isolate b/modules/modules_unittests.isolate index 353c24ef..43e659ce 100644 --- a/modules/modules_unittests.isolate +++ b/modules/modules_unittests.isolate @@ -8,10 +8,12 @@ { 'conditions': [ ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. 'variables': { 'isolate_dependency_untracked': [ - '../../../resources/', '../../../data/', + '../../../resources/', ], }, }], diff --git a/modules/video_capture/video_capture_module_test.isolate b/modules/video_capture/video_capture_module_test.isolate deleted file mode 100644 index 1c3a4b57..00000000 --- a/modules/video_capture/video_capture_module_test.isolate +++ /dev/null @@ -1,27 +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': [ - '../../../testing/test_env.py', - '../../../tools/swarm_client/googletest/run_test_cases.py', - '<(PRODUCT_DIR)/vp8_unittests<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_tracked': [ - '../../../testing/test_env.py', - '../../../tools/swarm_client/run_isolated.py', - '../../../tools/swarm_client/googletest/run_test_cases.py', - '../../../tools/swarm_client/third_party/upload.py', - '<(PRODUCT_DIR)/vp8_unittests<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/modules/video_capture/video_capture_tests.isolate b/modules/video_capture/video_capture_tests.isolate index fd4ed0ef..bafbd8b4 100644 --- a/modules/video_capture/video_capture_tests.isolate +++ b/modules/video_capture/video_capture_tests.isolate @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { 'conditions': [ + ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. + 'variables': { + 'isolate_dependency_untracked': [ + '../../../../data/', + '../../../../resources/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ diff --git a/modules/video_render/video_render_module_test.isolate b/modules/video_render/video_render_module_test.isolate deleted file mode 100644 index 6157b6d6..00000000 --- a/modules/video_render/video_render_module_test.isolate +++ /dev/null @@ -1,27 +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': [ - '../../../testing/test_env.py', - '../../../tools/swarm_client/googletest/run_test_cases.py', - '<(PRODUCT_DIR)/video_render_module_test<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_tracked': [ - '../../../testing/test_env.py', - '../../../tools/swarm_client/run_isolated.py', - '../../../tools/swarm_client/googletest/run_test_cases.py', - '../../../tools/swarm_client/third_party/upload.py', - '<(PRODUCT_DIR)/video_render_module_test<(EXECUTABLE_SUFFIX)', - ], - }, - }], - ], -} diff --git a/modules/video_render/video_render_tests.isolate b/modules/video_render/video_render_tests.isolate index ffc875d4..bd596be5 100644 --- a/modules/video_render/video_render_tests.isolate +++ b/modules/video_render/video_render_tests.isolate @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { 'conditions': [ + ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. + 'variables': { + 'isolate_dependency_untracked': [ + '../../../../data/', + '../../../../resources/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ diff --git a/system_wrappers/source/system_wrappers_unittests.isolate b/system_wrappers/source/system_wrappers_unittests.isolate index 84672c77..c13ad886 100644 --- a/system_wrappers/source/system_wrappers_unittests.isolate +++ b/system_wrappers/source/system_wrappers_unittests.isolate @@ -8,6 +8,16 @@ { 'conditions': [ + ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. + 'variables': { + 'isolate_dependency_untracked': [ + '../../../../resources/', + '../../../../data/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ diff --git a/test/metrics_unittests.isolate b/test/metrics_unittests.isolate index 5254df01..52287e34 100644 --- a/test/metrics_unittests.isolate +++ b/test/metrics_unittests.isolate @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { 'conditions': [ + ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. + 'variables': { + 'isolate_dependency_untracked': [ + '../../../data/', + '../../../resources/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ diff --git a/test/test_support_unittests.isolate b/test/test_support_unittests.isolate index d60dce40..3384ab8c 100644 --- a/test/test_support_unittests.isolate +++ b/test/test_support_unittests.isolate @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { 'conditions': [ + ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. + 'variables': { + 'isolate_dependency_untracked': [ + '../../../data/', + '../../../resources/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ diff --git a/test/testsupport/metrics/video_metrics_unittest.cc b/test/testsupport/metrics/video_metrics_unittest.cc index 28033220..21f86aad 100644 --- a/test/testsupport/metrics/video_metrics_unittest.cc +++ b/test/testsupport/metrics/video_metrics_unittest.cc @@ -140,4 +140,11 @@ TEST_F(VideoMetricsTest, DISABLED_ON_ANDROID(EmptyFilesBothMetrics)) { &psnr_result_, &ssim_result_)); } +// Dummy test to get at least one test in this executable for Android +// (otherwise gtest will fail execution on Android). +// TODO(kjellander): Remove when the other tests have been fixed for +// Android. +TEST_F(VideoMetricsTest, DummyTest) { +} + } // namespace webrtc diff --git a/tools/tools_unittests.isolate b/tools/tools_unittests.isolate index 60c2231f..14bd8995 100644 --- a/tools/tools_unittests.isolate +++ b/tools/tools_unittests.isolate @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { 'conditions': [ + ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. + 'variables': { + 'isolate_dependency_untracked': [ + '../../../data/', + '../../../resources/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ diff --git a/video_engine/test/auto_test/vie_auto_test.isolate b/video_engine/test/auto_test/vie_auto_test.isolate index fb3b9308..44418bff 100644 --- a/video_engine/test/auto_test/vie_auto_test.isolate +++ b/video_engine/test/auto_test/vie_auto_test.isolate @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { 'conditions': [ + ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. + 'variables': { + 'isolate_dependency_untracked': [ + '../../../../../data/', + '../../../../../resources/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ diff --git a/video_engine/video_engine_core_unittests.isolate b/video_engine/video_engine_core_unittests.isolate index 28f5151e..a82611b9 100644 --- a/video_engine/video_engine_core_unittests.isolate +++ b/video_engine/video_engine_core_unittests.isolate @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { 'conditions': [ + ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. + 'variables': { + 'isolate_dependency_untracked': [ + '../../../data/', + '../../../resources/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ diff --git a/voice_engine/voe_auto_test.isolate b/voice_engine/voe_auto_test.isolate index 465ec1a0..3401e3ff 100644 --- a/voice_engine/voe_auto_test.isolate +++ b/voice_engine/voe_auto_test.isolate @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { 'conditions': [ + ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. + 'variables': { + 'isolate_dependency_untracked': [ + '../../../data/', + '../../../resources/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ diff --git a/voice_engine/voice_engine_unittests.isolate b/voice_engine/voice_engine_unittests.isolate index d90fa3c7..4c17afa6 100644 --- a/voice_engine/voice_engine_unittests.isolate +++ b/voice_engine/voice_engine_unittests.isolate @@ -7,6 +7,16 @@ # be found in the AUTHORS file in the root of the source tree. { 'conditions': [ + ['OS=="android"', { + # When doing Android builds, the WebRTC code is put in third_party/webrtc + # of a Chromium checkout, this is one level above the standalone build. + 'variables': { + 'isolate_dependency_untracked': [ + '../../../data/', + '../../../resources/', + ], + }, + }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { 'command': [ |