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

Side by Side Diff: chrome/chrome_installer_util.gypi

Issue 24994002: Don't pull in content_switches.cc to whole chrome code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 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 | « chrome/chrome_exe.gypi ('k') | chrome/common_constants.gyp » ('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 { 5 {
6 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'installer_util_target': 0, 8 'installer_util_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 'variables': { 105 'variables': {
106 'installer_util_target': 1, 106 'installer_util_target': 1,
107 }, 107 },
108 'dependencies': [ 108 'dependencies': [
109 'installer_util_strings', 109 'installer_util_strings',
110 '<(DEPTH)/base/base.gyp:base', 110 '<(DEPTH)/base/base.gyp:base',
111 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.g yp:dynamic_annotations', 111 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.g yp:dynamic_annotations',
112 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', 112 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
113 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', 113 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
114 '<(DEPTH)/chrome/common_constants.gyp:common_constants', 114 '<(DEPTH)/chrome/common_constants.gyp:common_constants',
115 '<(DEPTH)/content/content.gyp:content_common',
116 '<(DEPTH)/courgette/courgette.gyp:courgette_lib', 115 '<(DEPTH)/courgette/courgette.gyp:courgette_lib',
117 '<(DEPTH)/crypto/crypto.gyp:crypto', 116 '<(DEPTH)/crypto/crypto.gyp:crypto',
118 '<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch', 117 '<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch',
119 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 118 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
120 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 119 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
121 '<(DEPTH)/third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk', 120 '<(DEPTH)/third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk',
122 ], 121 ],
123 'sources': [ 122 'sources': [
124 'installer/util/chrome_app_host_operations.cc', 123 'installer/util/chrome_app_host_operations.cc',
125 'installer/util/chrome_app_host_operations.h', 124 'installer/util/chrome_app_host_operations.h',
(...skipping 28 matching lines...) Expand all
154 'installer/util/product_operations.h', 153 'installer/util/product_operations.h',
155 'installer/util/self_cleaning_temp_dir.cc', 154 'installer/util/self_cleaning_temp_dir.cc',
156 'installer/util/self_cleaning_temp_dir.h', 155 'installer/util/self_cleaning_temp_dir.h',
157 'installer/util/shell_util.cc', 156 'installer/util/shell_util.cc',
158 'installer/util/shell_util.h', 157 'installer/util/shell_util.h',
159 'installer/util/uninstall_metrics.cc', 158 'installer/util/uninstall_metrics.cc',
160 'installer/util/uninstall_metrics.h', 159 'installer/util/uninstall_metrics.h',
161 'installer/util/user_experiment.cc', 160 'installer/util/user_experiment.cc',
162 'installer/util/user_experiment.h', 161 'installer/util/user_experiment.h',
163 ], 162 ],
164 'conditions': [
165 ['component=="shared_library"', {
166 'sources': [ '../content/public/common/content_switches.cc' ],
167 'defines': [ 'COMPILE_CONTENT_STATICALLY'],
168 }, {
169 'dependencies': ['<(DEPTH)/content/content.gyp:content_common'],
170 }],
171 ],
172 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 163 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
173 'msvs_disabled_warnings': [ 4267, ], 164 'msvs_disabled_warnings': [ 4267, ],
174 }, 165 },
175 ], 166 ],
176 }], 167 }],
177 ['OS=="win" and target_arch=="ia32"', { 168 ['OS=="win" and target_arch=="ia32"', {
178 'targets': [ 169 'targets': [
179 { 170 {
180 'target_name': 'installer_util_nacl_win64', 171 'target_name': 'installer_util_nacl_win64',
181 'type': 'static_library', 172 'type': 'static_library',
(...skipping 21 matching lines...) Expand all
203 }], 194 }],
204 ['OS!="win"', { 195 ['OS!="win"', {
205 'targets': [ 196 'targets': [
206 { 197 {
207 'target_name': 'installer_util', 198 'target_name': 'installer_util',
208 'type': 'static_library', 199 'type': 'static_library',
209 'dependencies': [ 200 'dependencies': [
210 '<(DEPTH)/base/base.gyp:base', 201 '<(DEPTH)/base/base.gyp:base',
211 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', 202 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
212 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', 203 '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
213 '<(DEPTH)/chrome/common_constants.gyp:common_constants',
214 ], 204 ],
215 'sources': [ 205 'sources': [
216 'installer/util/google_update_experiment_util.cc', 206 'installer/util/google_update_experiment_util.cc',
217 'installer/util/google_update_experiment_util.h', 207 'installer/util/google_update_experiment_util.h',
218 'installer/util/master_preferences.cc', 208 'installer/util/master_preferences.cc',
219 'installer/util/master_preferences.h', 209 'installer/util/master_preferences.h',
220 'installer/util/master_preferences_constants.cc', 210 'installer/util/master_preferences_constants.cc',
221 'installer/util/master_preferences_constants.h', 211 'installer/util/master_preferences_constants.h',
222 ], 212 ],
223 'include_dirs': [ 213 'include_dirs': [
224 '<(DEPTH)', 214 '<(DEPTH)',
225 ], 215 ],
226 'conditions': [
227 ['component == "shared_library"', {
228 'sources': [ '../content/public/common/content_switches.cc' ],
229 'defines': [ 'COMPILE_CONTENT_STATICALLY'],
230 }],
231 ],
232 } 216 }
233 ], 217 ],
234 }], 218 }],
235 219
236 ], 220 ],
237 } 221 }
OLDNEW
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/common_constants.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698