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

Side by Side Diff: build/isolate.gypi

Issue 687173002: Fix build with disable_nacl=1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated Created 6 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser_tests.isolate » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # This file is meant to be included into a target to provide a rule 5 # This file is meant to be included into a target to provide a rule
6 # to "build" .isolate files into a .isolated file. 6 # to "build" .isolate files into a .isolated file.
7 # 7 #
8 # To use this, create a gyp target with the following form: 8 # To use this, create a gyp target with the following form:
9 # 'conditions': [ 9 # 'conditions': [
10 # ['test_isolation_mode != "noop"', { 10 # ['test_isolation_mode != "noop"', {
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 # TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run 83 # TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run
84 # once support for user-defined config variables is added. 84 # once support for user-defined config variables is added.
85 '--config-variable', 85 '--config-variable',
86 'internal_gles2_conform_tests=<(internal_gles2_conform_tests)', 86 'internal_gles2_conform_tests=<(internal_gles2_conform_tests)',
87 '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)', 87 '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)',
88 '--config-variable', 'lsan=<(lsan)', 88 '--config-variable', 'lsan=<(lsan)',
89 '--config-variable', 'libpeer_target_type=<(libpeer_target_type)', 89 '--config-variable', 'libpeer_target_type=<(libpeer_target_type)',
90 '--config-variable', 'use_openssl=<(use_openssl)', 90 '--config-variable', 'use_openssl=<(use_openssl)',
91 '--config-variable', 'target_arch=<(target_arch)', 91 '--config-variable', 'target_arch=<(target_arch)',
92 '--config-variable', 'use_ozone=<(use_ozone)', 92 '--config-variable', 'use_ozone=<(use_ozone)',
93 '--config-variable', 'disable_nacl=<(disable_nacl)',
93 ], 94 ],
94 'conditions': [ 95 'conditions': [
95 # Note: When gyp merges lists, it appends them to the old value. 96 # Note: When gyp merges lists, it appends them to the old value.
96 ['OS=="mac"', { 97 ['OS=="mac"', {
97 # <(mac_product_name) can contain a space, so don't use FOO=<(FOO) 98 # <(mac_product_name) can contain a space, so don't use FOO=<(FOO)
98 # form. 99 # form.
99 'action': [ 100 'action': [
100 '--extra-variable', 'mac_product_name', '<(mac_product_name)', 101 '--extra-variable', 'mac_product_name', '<(mac_product_name)',
101 ], 102 ],
102 }], 103 }],
103 ["test_isolation_outdir!=''", { 104 ["test_isolation_outdir!=''", {
104 'action': [ '--isolate-server', '<(test_isolation_outdir)' ], 105 'action': [ '--isolate-server', '<(test_isolation_outdir)' ],
105 }], 106 }],
106 ['test_isolation_fail_on_missing == 0', { 107 ['test_isolation_fail_on_missing == 0', {
107 'action': ['--ignore_broken_items'], 108 'action': ['--ignore_broken_items'],
108 }], 109 }],
109 ["test_isolation_mode == 'prepare'", { 110 ["test_isolation_mode == 'prepare'", {
110 'outputs': [ 111 'outputs': [
111 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated.gen.json', 112 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated.gen.json',
112 ], 113 ],
113 }, { 114 }, {
114 'outputs': [ 115 'outputs': [
115 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated', 116 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated',
116 ], 117 ],
117 }], 118 }],
118 ], 119 ],
119 }, 120 },
120 ], 121 ],
121 } 122 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698