Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: ui/touch_selection/ui_touch_selection.gyp

Issue 1374843004: Isolate ui_touch_selection_unittests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | ui/touch_selection/ui_touch_selection_unittests_apk.isolate » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 'type': 'none', 122 'type': 'none',
123 'dependencies': [ 123 'dependencies': [
124 'ui_touch_selection_unittests', 124 'ui_touch_selection_unittests',
125 ], 125 ],
126 'variables': { 126 'variables': {
127 'test_suite_name': 'ui_touch_selection_unittests', 127 'test_suite_name': 'ui_touch_selection_unittests',
128 }, 128 },
129 'includes': [ '../../build/apk_test.gypi' ], 129 'includes': [ '../../build/apk_test.gypi' ],
130 }, 130 },
131 ], 131 ],
132 'conditions': [
133 ['test_isolation_mode != "noop"', {
134 'targets': [
135 {
136 'target_name': 'ui_touch_selection_unittests_apk_run',
137 'type': 'none',
138 'dependencies': [
139 'ui_touch_selection_unittests_apk',
140 ],
141 'includes': [
142 '../../build/isolate.gypi',
143 ],
144 'sources': [
145 'ui_touch_selection_unittests_apk.isolate',
146 ],
147 },
148 ]
149 }],
150 ],
132 }], # OS == "android" 151 }], # OS == "android"
133 ['test_isolation_mode != "noop"', { 152 ['test_isolation_mode != "noop" and OS != "android"', {
134 'targets': [ 153 'targets': [
135 { 154 {
136 'target_name': 'ui_touch_selection_unittests_run', 155 'target_name': 'ui_touch_selection_unittests_run',
137 'type': 'none', 156 'type': 'none',
138 'dependencies': [ 157 'dependencies': [
139 'ui_touch_selection_unittests', 158 'ui_touch_selection_unittests',
140 ], 159 ],
141 'includes': [ 160 'includes': [
142 '../../build/isolate.gypi', 161 '../../build/isolate.gypi',
143 ], 162 ],
144 'sources': [ 163 'sources': [
145 'ui_touch_selection_unittests.isolate', 164 'ui_touch_selection_unittests.isolate',
146 ], 165 ],
147 'conditions': [ 166 'conditions': [
148 ['use_x11 == 1', { 167 ['use_x11 == 1', {
149 'dependencies': [ 168 'dependencies': [
150 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 169 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
151 ], 170 ],
152 }], 171 }],
153 ], 172 ],
154 }, 173 },
155 ], 174 ],
156 }], 175 }],
157 ], 176 ],
158 } 177 }
OLDNEW
« no previous file with comments | « no previous file | ui/touch_selection/ui_touch_selection_unittests_apk.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698