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

Unified Diff: build/isolate.gypi

Issue 12457024: test_isolation_outdir must be considered an opaque string, it could be an url. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove RULE_INPUT_PATH Created 7 years, 9 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/isolate.gypi
diff --git a/build/isolate.gypi b/build/isolate.gypi
index 6ddc3fef2bfd1a3748f1103fff2c9fe18d9e609d..d57dc49650d67d51faec42d24b0dbfd389509d96 100644
--- a/build/isolate.gypi
+++ b/build/isolate.gypi
@@ -40,7 +40,6 @@
'rule_name': 'isolate',
'extension': 'isolate',
'inputs': [
- '<(RULE_INPUT_PATH)',
# Disable file tracking by the build driver for now. This means the
# project must have the proper build-time dependency for their runtime
# dependency. This improves the runtime of the build driver since it
@@ -56,20 +55,30 @@
'outputs': [
'<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated',
],
- 'action': [
- 'python',
- '<(DEPTH)/tools/swarm_client/isolate.py',
- '<(test_isolation_mode)',
- '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
- '--variable', 'OS', '<(OS)',
- '--variable', 'chromeos', '<(chromeos)',
- '--result', '<@(_outputs)',
- '--isolate', '<(RULE_INPUT_PATH)',
- ],
'conditions': [
- ["test_isolation_outdir!=''", {
+ ["test_isolation_outdir==''", {
+ 'action': [
+ 'python',
+ '<(DEPTH)/tools/swarm_client/isolate.py',
+ '<(test_isolation_mode)',
+ '--outdir', '<(PRODUCT_DIR)',
+ '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
+ '--variable', 'OS', '<(OS)',
+ '--variable', 'chromeos', '<(chromeos)',
+ '--result', '<@(_outputs)',
+ '--isolate', '<(RULE_INPUT_PATH)',
+ ],
+ }, {
'action': [
- '--outdir', '<(PRODUCT_DIR)/<(test_isolation_outdir)',
+ 'python',
+ '<(DEPTH)/tools/swarm_client/isolate.py',
+ '<(test_isolation_mode)',
+ '--outdir', '<(test_isolation_outdir)',
+ '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
+ '--variable', 'OS', '<(OS)',
+ '--variable', 'chromeos', '<(chromeos)',
+ '--result', '<@(_outputs)',
+ '--isolate', '<(RULE_INPUT_PATH)',
],
}],
],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698