summaryrefslogtreecommitdiffstats
path: root/components/components_browsertests.isolate
diff options
context:
space:
mode:
authorjaekyun <jaekyun@chromium.org>2015-04-22 21:22:48 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-23 04:22:48 +0000
commit4ba34ff136727244ead91780152b3248fe7ce0fd (patch)
tree7d92757a191a5873c0dbdfe3579cd0818d26c434 /components/components_browsertests.isolate
parentc32d8a85648b9e19320368f1dd91ddaca814fd0e (diff)
downloadchromium_src-4ba34ff136727244ead91780152b3248fe7ce0fd.zip
chromium_src-4ba34ff136727244ead91780152b3248fe7ce0fd.tar.gz
chromium_src-4ba34ff136727244ead91780152b3248fe7ce0fd.tar.bz2
Enable components_browsertests on Android
BUG=465351 Review URL: https://codereview.chromium.org/1075783002 Cr-Commit-Position: refs/heads/master@{#326449}
Diffstat (limited to 'components/components_browsertests.isolate')
-rw-r--r--components/components_browsertests.isolate18
1 files changed, 16 insertions, 2 deletions
diff --git a/components/components_browsertests.isolate b/components/components_browsertests.isolate
index 2dff53a..e60cea1 100644
--- a/components/components_browsertests.isolate
+++ b/components/components_browsertests.isolate
@@ -34,18 +34,32 @@
],
},
}],
+ ['OS=="android"', {
+ 'variables': {
+ 'files': [
+ '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets/components_tests_resources.pak',
+ '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets/content_shell.pak',
+ ],
+ },
+ }],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
- 'test/data/',
'../testing/test_env.py',
- '../third_party/dom_distiller_js/dist/test/data/',
'<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/components_tests_resources.pak',
'<(PRODUCT_DIR)/content_shell.pak',
],
},
}],
+ ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
+ 'variables': {
+ 'files': [
+ 'test/data/',
+ '../third_party/dom_distiller_js/dist/test/data/',
+ ],
+ },
+ }],
['OS=="linux"', {
'variables': {
'files': [