Isolate ui_base_unittests_apk.

BUG=525873 Review URL: https://codereview.chromium.org/1402903002 Cr-Commit-Position: refs/heads/master@{#353844}
marcosholgado · Oct 13, 2015 · 2bc7089 · 2bc7089
1 parent f811b47
commit 2bc7089
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 1 deletion.
diff --git a/ui/base/ui_base_tests.gyp b/ui/base/ui_base_tests.gyp
@@ -288,8 +288,29 @@
           'includes': [ '../../build/apk_test.gypi' ],
         },
       ],
+      'conditions': [
+        ['test_isolation_mode != "noop"',
+          {
+            'targets': [
+              {
+                'target_name': 'ui_base_unittests_apk_run',
+                'type': 'none',
+                'dependencies': [
+                  'ui_base_unittests_apk',
+                ],
+                'includes': [
+                  '../../build/isolate.gypi',
+                ],
+                'sources': [
+                  'ui_base_unittests_apk.isolate',
+                ],
+              },
+            ],
+          },
+        ],
+      ],
     }],
-    ['test_isolation_mode != "noop"', {
+    ['test_isolation_mode != "noop" and OS != "android"', {
       'targets': [
         {
           'target_name': 'ui_base_unittests_run',

diff --git a/ui/base/ui_base_unittests_apk.isolate b/ui/base/ui_base_unittests_apk.isolate
@@ -0,0 +1,20 @@
+# 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',
+    'ui_base_tests.isolate'
+  ],
+  'variables': {
+    'command': [
+      '<(PRODUCT_DIR)/bin/run_ui_base_unittests',
+    ],
+    'files': [
+      '../../third_party/icu/icu.isolate'
+      '<(PRODUCT_DIR)/bin/run_ui_base_unittests',
+      '<(PRODUCT_DIR)/ui_base_unittests_apk/',
+      'ui_base_tests.isolate',
+    ]
+  },
+}