Add isolate configuration for Android for all tests.

In https://code.google.com/p/webrtc/source/detail?r=4407
henrike@ added the path to the WebRTC resources and
data directories for Android that are required in order to
use isolate for test execution on Android.

This CL adds similar entries to the rest of the .isolate
files added in
https://code.google.com/p/webrtc/source/detail?r=4590.

It also removes three accidentally added .isolate files that originated
from old test names:
* audio_device_test_api
* video_capture_module_test
* video_render_module_test

BUG=1882,1916
TEST=trybots passing.
R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2107004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4627 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/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': [

webrtc/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': [

webrtc/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': [

webrtc/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': [

webrtc/modules/audio_device/audio_device_test_api.isolate

@@ -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)',
-        ],
-      },
-    }],
-  ],
-}

webrtc/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': [

webrtc/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',

webrtc/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/',
         ],
       },
     }],

webrtc/modules/video_capture/video_capture_module_test.isolate

@@ -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)',
-        ],
-      },
-    }],
-  ],
-}

webrtc/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': [

webrtc/modules/video_render/video_render_module_test.isolate

@@ -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)',
-        ],
-      },
-    }],
-  ],
-}

webrtc/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': [

webrtc/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': [

webrtc/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': [

webrtc/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': [

webrtc/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

webrtc/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': [

webrtc/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': [

webrtc/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': [

webrtc/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': [

webrtc/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': [