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

Unified Diff: base/base_unittests.isolate

Issue 17267004: [Android] Enable using isolate files to get a list of data dependencies to push to the device. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Generate isolated files Created 7 years, 6 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
« no previous file with comments | « no previous file | build/android/pylib/gtest/test_runner.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base_unittests.isolate
diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate
index 929b146492439f1a83ce4b175392997b8b03de50..a88efe075b92cb913cda10b8d1f97e1e84f4a0f8 100644
--- a/base/base_unittests.isolate
+++ b/base/base_unittests.isolate
@@ -3,6 +3,21 @@
# found in the LICENSE file.
{
'conditions': [
+ ['OS=="android"', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/base_unittests_apk/base_unittests-debug.apk',
frankf 2013/06/21 20:38:19 It doesn't make much sense to list the apk here: c
+ ],
+ },
+ }],
+ ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
+ 'variables': {
+ 'isolate_dependency_untracked': [
+ 'data/',
+ 'test/data/',
+ ],
+ },
+ }],
['OS=="linux"', {
'variables': {
'command': [
@@ -25,10 +40,6 @@
'../tools/swarm_client/run_test_cases.py',
'<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
],
- 'isolate_dependency_untracked': [
- 'data/',
- 'test/data/',
- ],
},
}],
['OS=="mac" or OS=="win"', {
« no previous file with comments | « no previous file | build/android/pylib/gtest/test_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698