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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: components/components_browsertests.isolate
diff --git a/components/components_browsertests.isolate b/components/components_browsertests.isolate
index f384f85f00448455bf20684177a62d8e82f3ab21..de884c60c374962f763046ef3b43a4eb045ad7f9 100644
--- a/components/components_browsertests.isolate
+++ b/components/components_browsertests.isolate
@@ -34,17 +34,31 @@
],
},
}],
+ ['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',
'<(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/',
+ '../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.
+ ],
+ },
+ }],
['OS=="linux"', {
'variables': {
'files': [

Powered by Google App Engine
This is Rietveld 408576698