Isolate ipc_tests_apk.

BUG=525873 Review URL: https://codereview.chromium.org/1394863003 Cr-Commit-Position: refs/heads/master@{#353846}
Denger-Network · Oct 13, 2015 · d29eaeb · d29eaeb
1 parent 265ed50
commit d29eaeb
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
@@ -215,9 +215,29 @@
             'test_suite_name': 'ipc_perftests',
           },
           'includes': [ '../build/apk_test.gypi' ],
+        }
+      ],
+      'conditions': [
+        ['test_isolation_mode != "noop"', {
+          'targets': [
+            {
+              'target_name': 'ipc_tests_apk_run',
+              'type': 'none',
+              'dependencies': [
+                'ipc_tests_apk',
+              ],
+              'includes': [
+                '../build/isolate.gypi',
+              ],
+              'sources': [
+                'ipc_tests_apk.isolate',
+              ],
+            },
+          ],
         }],
+      ],
     }],
-    ['test_isolation_mode != "noop"', {
+    ['test_isolation_mode != "noop" and OS != "android"', {
       'targets': [
         {
           'target_name': 'ipc_tests_run',

diff --git a/ipc/ipc_tests_apk.isolate b/ipc/ipc_tests_apk.isolate
@@ -0,0 +1,17 @@
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+{
+  'includes': [
+    '../build/android/android.isolate',
+  ],
+  'variables': {
+    'command': [
+      '<(PRODUCT_DIR)/bin/run_ipc_tests',
+    ],
+    'files': [
+      '<(PRODUCT_DIR)/bin/run_ipc_tests',
+      '<(PRODUCT_DIR)/ipc_tests_apk/',
+    ]
+  },
+}