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

Side by Side Diff: build/isolate.gypi

Issue 599863003: Fix ChromeOS Ozone build since it doesn't have xdisplaycheck. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « build/android/pylib/gtest/setup.py ('k') | 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 '--config-variable', 'component=<(component)', 94 '--config-variable', 'component=<(component)',
95 '--config-variable', 'fastbuild=<(fastbuild)', 95 '--config-variable', 'fastbuild=<(fastbuild)',
96 # TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run 96 # TODO(kbr): move this to chrome_tests.gypi:gles2_conform_tests_run
97 # once support for user-defined config variables is added. 97 # once support for user-defined config variables is added.
98 '--config-variable', 98 '--config-variable',
99 'internal_gles2_conform_tests=<(internal_gles2_conform_tests)', 99 'internal_gles2_conform_tests=<(internal_gles2_conform_tests)',
100 '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)', 100 '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)',
101 '--config-variable', 'libpeer_target_type=<(libpeer_target_type)', 101 '--config-variable', 'libpeer_target_type=<(libpeer_target_type)',
102 '--config-variable', 'use_openssl=<(use_openssl)', 102 '--config-variable', 'use_openssl=<(use_openssl)',
103 '--config-variable', 'target_arch=<(target_arch)', 103 '--config-variable', 'target_arch=<(target_arch)',
104 '--config-variable', 'use_ozone=<(use_ozone)',
104 ], 105 ],
105 'conditions': [ 106 'conditions': [
106 # Note: When gyp merges lists, it appends them to the old value. 107 # Note: When gyp merges lists, it appends them to the old value.
107 ['OS=="mac"', { 108 ['OS=="mac"', {
108 # <(mac_product_name) can contain a space, so don't use FOO=<(FOO) 109 # <(mac_product_name) can contain a space, so don't use FOO=<(FOO)
109 # form. 110 # form.
110 'action': [ 111 'action': [
111 '--extra-variable', 'mac_product_name', '<(mac_product_name)', 112 '--extra-variable', 'mac_product_name', '<(mac_product_name)',
112 ], 113 ],
113 }], 114 }],
114 ["test_isolation_outdir!=''", { 115 ["test_isolation_outdir!=''", {
115 'action': [ '--isolate-server', '<(test_isolation_outdir)' ], 116 'action': [ '--isolate-server', '<(test_isolation_outdir)' ],
116 }], 117 }],
117 ['test_isolation_fail_on_missing == 0', { 118 ['test_isolation_fail_on_missing == 0', {
118 'action': ['--ignore_broken_items'], 119 'action': ['--ignore_broken_items'],
119 }], 120 }],
120 ["test_isolation_mode == 'prepare'", { 121 ["test_isolation_mode == 'prepare'", {
121 'outputs': [ 122 'outputs': [
122 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated.gen.json', 123 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated.gen.json',
123 ], 124 ],
124 }, { 125 }, {
125 'outputs': [ 126 'outputs': [
126 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated', 127 '<(PRODUCT_DIR)/<(RULE_INPUT_ROOT).isolated',
127 ], 128 ],
128 }], 129 }],
129 ], 130 ],
130 }, 131 },
131 ], 132 ],
132 } 133 }
OLDNEW
« no previous file with comments | « build/android/pylib/gtest/setup.py ('k') | chrome/browser_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698