commit e532aec25220f94830c538acfeccc2203b6db4f5
author kjellander <kjellander@webrtc.org> Mon Apr 18 03:08:20 2016
committer Commit bot <commit-bot@chromium.org> Mon Apr 18 03:08:28 2016
tree 27d6c54bdb464b1ce2b0d0b688f2d4db870a4e8f
parent a5868de17ec79a7d23d8cd51030108b1a24ea08e

Add isolate files for Android tests

BUG=chromium:583318
TESTED=Passing runs with:
GYP_DEFINES='test_isolation_mode=prepare OS=android' webrtc/build/gyp_webrtc
ninja -C out/Release
NOTRY=True
NOPRESUBMIT=True

Review URL: https://codereview.webrtc.org/1882963003

Cr-Commit-Position: refs/heads/master@{#12397}

webrtc/common_video/common_video_unittests.gyp

diff --git a/webrtc/common_video/common_video_unittests.gyp b/webrtc/common_video/common_video_unittests.gyp
index 545bfa4..5fa082a 100644
--- a/webrtc/common_video/common_video_unittests.gyp
+++ b/webrtc/common_video/common_video_unittests.gyp
@@ -54,7 +54,28 @@
           ],
         },
       ],
-    }],
+      'conditions': [
+        ['test_isolation_mode != "noop"',
+          {
+            'targets': [
+              {
+                'target_name': 'common_video_unittests_apk_run',
+                'type': 'none',
+                'dependencies': [
+                  '<(apk_tests_path):common_video_unittests_apk',
+                ],
+                'includes': [
+                  '../build/isolate.gypi',
+                ],
+                'sources': [
+                  'common_video_unittests_apk.isolate',
+                ],
+              },
+            ],
+          },
+        ],
+      ],
+    }],  # OS=="android"
     ['test_isolation_mode != "noop"', {
       'targets': [
         {

webrtc/common_video/common_video_unittests_apk.isolate

diff --git a/webrtc/common_video/common_video_unittests_apk.isolate b/webrtc/common_video/common_video_unittests_apk.isolate
new file mode 100644
index 0000000..36514cd
--- /dev/null
+++ b/webrtc/common_video/common_video_unittests_apk.isolate
@@ -0,0 +1,26 @@
+# Copyright (c) 2016 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.
+{
+  'includes': [
+    '../../build/android/android.isolate',
+    'common_video_unittests.isolate',
+  ],
+  'variables': {
+    'command': [
+      '<(PRODUCT_DIR)/bin/run_common_video_unittests',
+      '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
+    ],
+    'files': [
+      '../../build/config/',
+      '../../third_party/instrumented_libraries/instrumented_libraries.isolate',
+      '<(PRODUCT_DIR)/common_video_unittests_apk/',
+      '<(PRODUCT_DIR)/bin/run_common_video_unittests',
+      'common_video_unittests.isolate',
+    ]
+  }
+}