summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstip <stip@chromium.org>2015-10-02 13:05:38 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-02 20:06:50 +0000
commitee435a841a4677d44698bb095378ccf3be331eae (patch)
tree110137b38bdb437487dfa118d06d54eed1abae26
parent55c4d4faddc1b3289269e0656d96e9859d6b729c (diff)
downloadchromium_src-ee435a841a4677d44698bb095378ccf3be331eae.zip
chromium_src-ee435a841a4677d44698bb095378ccf3be331eae.tar.gz
chromium_src-ee435a841a4677d44698bb095378ccf3be331eae.tar.bz2
Isolate events_unittests_apk.
BUG=525873 R=maruel@chromium.org,jbudorick@chromium.org,sky@chromium.org Review URL: https://codereview.chromium.org/1372763002 Cr-Commit-Position: refs/heads/master@{#352107}
-rw-r--r--ui/events/events.gyp19
-rw-r--r--ui/events/events_unittests_apk.isolate17
2 files changed, 36 insertions, 0 deletions
diff --git a/ui/events/events.gyp b/ui/events/events.gyp
index 128f08c..3bd849e 100644
--- a/ui/events/events.gyp
+++ b/ui/events/events.gyp
@@ -493,6 +493,25 @@
'includes': [ '../../build/apk_test.gypi' ],
},
],
+ 'conditions': [
+ ['test_isolation_mode != "noop"', {
+ 'targets': [
+ {
+ 'target_name': 'events_unittests_apk_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'events_unittests_apk',
+ ],
+ 'includes': [
+ '../../build/isolate.gypi',
+ ],
+ 'sources': [
+ 'events_unittests_apk.isolate',
+ ],
+ },
+ ],
+ }],
+ ],
}],
['test_isolation_mode != "noop"', {
'targets': [
diff --git a/ui/events/events_unittests_apk.isolate b/ui/events/events_unittests_apk.isolate
new file mode 100644
index 0000000..c45db50
--- /dev/null
+++ b/ui/events/events_unittests_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_events_unittests',
+ ],
+ 'files': [
+ '<(PRODUCT_DIR)/bin/run_events_unittests',
+ '<(PRODUCT_DIR)/events_unittests_apk/',
+ ]
+ },
+}