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

Side by Side Diff: components/components_browsertests.isolate

Issue 1075783002: Enable components_browsertests on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix DistillerPageWebContentsTest and DomDistillerDistillablePageUtilsTest Created 5 years, 8 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
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 'conditions': [ 5 'conditions': [
6 ['use_x11==0', { 6 ['use_x11==0', {
7 'variables': { 7 'variables': {
8 'command': [ 8 'command': [
9 '../testing/test_env.py', 9 '../testing/test_env.py',
10 '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
(...skipping 16 matching lines...) Expand all
27 '--asan=<(asan)', 27 '--asan=<(asan)',
28 '--msan=<(msan)', 28 '--msan=<(msan)',
29 '--tsan=<(tsan)', 29 '--tsan=<(tsan)',
30 ], 30 ],
31 'files': [ 31 'files': [
32 '../testing/xvfb.py', 32 '../testing/xvfb.py',
33 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 33 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
34 ], 34 ],
35 }, 35 },
36 }], 36 }],
37 ['OS=="android"', {
38 'variables': {
39 'files': [
40 '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets/components_te sts_resources.pak',
41 '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets/content_shell .pak',
42 ],
43 },
44 }],
37 ['OS=="linux" or OS=="mac" or OS=="win"', { 45 ['OS=="linux" or OS=="mac" or OS=="win"', {
38 'variables': { 46 'variables': {
39 'files': [ 47 'files': [
40 'test/data/',
41 '../testing/test_env.py',
42 '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)', 48 '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
43 '<(PRODUCT_DIR)/components_tests_resources.pak', 49 '<(PRODUCT_DIR)/components_tests_resources.pak',
44 '<(PRODUCT_DIR)/content_shell.pak', 50 '<(PRODUCT_DIR)/content_shell.pak',
45 ], 51 ],
46 }, 52 },
47 }], 53 }],
54 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
55 'variables': {
56 'files': [
57 'test/data/',
58 '../testing/test_env.py',
jbudorick 2015/04/10 13:34:31 Is this really necessary on Android?
Jaekyun Seok (inactive) 2015/04/13 01:36:02 I moved this the above block.
59 ],
60 },
61 }],
48 ['OS=="linux"', { 62 ['OS=="linux"', {
49 'variables': { 63 'variables': {
50 'files': [ 64 'files': [
51 '<(PRODUCT_DIR)/libosmesa.so', 65 '<(PRODUCT_DIR)/libosmesa.so',
52 ], 66 ],
53 }, 67 },
54 }], 68 }],
55 ['OS=="mac"', { 69 ['OS=="mac"', {
56 'variables': { 70 'variables': {
57 'files': [ 71 'files': [
(...skipping 11 matching lines...) Expand all
69 ], 83 ],
70 }, 84 },
71 }], 85 }],
72 ], 86 ],
73 'includes': [ 87 'includes': [
74 '../base/base.isolate', 88 '../base/base.isolate',
75 '../gin/v8.isolate', 89 '../gin/v8.isolate',
76 '../third_party/angle/angle.isolate', 90 '../third_party/angle/angle.isolate',
77 ], 91 ],
78 } 92 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698