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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 1818423003: Revert of Remove configuration policy from chrome build files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@policy_chrome_defines
Patch Set: Created 4 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 unified diff | Download patch
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/chrome_exe.gypi » ('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 'conditions': [ 5 'conditions': [
6 # Dummy target to allow chrome to require chrome_dll to build 6 # Dummy target to allow chrome to require chrome_dll to build
7 # without actually linking to the library 7 # without actually linking to the library
8 ['OS=="mac"', { 8 ['OS=="mac"', {
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 'app/chrome_main_delegate.cc', 115 'app/chrome_main_delegate.cc',
116 'app/chrome_main_delegate.h', 116 'app/chrome_main_delegate.h',
117 'app/chrome_main_mac.h', 117 'app/chrome_main_mac.h',
118 'app/chrome_main_mac.mm', 118 'app/chrome_main_mac.mm',
119 'app/delay_load_hook_win.cc', 119 'app/delay_load_hook_win.cc',
120 'app/delay_load_hook_win.h', 120 'app/delay_load_hook_win.h',
121 ], 121 ],
122 'dependencies': [ 122 'dependencies': [
123 '<@(chromium_browser_dependencies)', 123 '<@(chromium_browser_dependencies)',
124 'chrome_features.gyp:chrome_common_features', 124 'chrome_features.gyp:chrome_common_features',
125 'policy_path_parser',
126 '../content/content.gyp:content_app_browser', 125 '../content/content.gyp:content_app_browser',
127 ], 126 ],
128 'conditions': [ 127 'conditions': [
129 ['OS=="win"', { 128 ['OS=="win"', {
130 'dependencies': [ 129 'dependencies': [
131 '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf', 130 '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf',
131 ],
132 }],
133 ['OS=="win" and configuration_policy==1', {
134 'dependencies': [
132 '<(DEPTH)/components/components.gyp:policy', 135 '<(DEPTH)/components/components.gyp:policy',
133 ], 136 ],
134 }], 137 }],
135 ['use_aura==1', { 138 ['use_aura==1', {
136 'dependencies': [ 139 'dependencies': [
137 '../ui/compositor/compositor.gyp:compositor', 140 '../ui/compositor/compositor.gyp:compositor',
138 ], 141 ],
139 }], 142 }],
140 ['OS=="win" and target_arch=="ia32"', { 143 ['OS=="win" and target_arch=="ia32"', {
141 # Add a dependency to custom import library for user32 delay 144 # Add a dependency to custom import library for user32 delay
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 'CHROME_MULTIPLE_DLL_CHILD', 356 'CHROME_MULTIPLE_DLL_CHILD',
354 ], 357 ],
355 'sources': [ 358 'sources': [
356 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', 359 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
357 'app/chrome_main.cc', 360 'app/chrome_main.cc',
358 'app/chrome_main_delegate.cc', 361 'app/chrome_main_delegate.cc',
359 'app/chrome_main_delegate.h', 362 'app/chrome_main_delegate.h',
360 ], 363 ],
361 'conditions': [ 364 'conditions': [
362 ['OS=="win"', { 365 ['OS=="win"', {
363 'dependencies': [
364 '<(DEPTH)/components/components.gyp:policy',
365 ],
366 'conditions': [ 366 'conditions': [
367 ['chrome_pgo_phase!=0', { 367 ['chrome_pgo_phase!=0', {
368 # Disable Warning 4702 ("Unreachable code") for the WPO/PGO 368 # Disable Warning 4702 ("Unreachable code") for the WPO/PGO
369 # builds. Probably anything that this would catch that 369 # builds. Probably anything that this would catch that
370 # wouldn't be caught in a normal build isn't going to 370 # wouldn't be caught in a normal build isn't going to
371 # actually be a bug, so the incremental value of C4702 for 371 # actually be a bug, so the incremental value of C4702 for
372 # PGO builds is likely very small. 372 # PGO builds is likely very small.
373 'msvs_disabled_warnings': [ 373 'msvs_disabled_warnings': [
374 4702 374 4702
375 ], 375 ],
(...skipping 16 matching lines...) Expand all
392 }], 392 }],
393 ['chrome_pgo_phase==2', { 393 ['chrome_pgo_phase==2', {
394 'msvs_settings': { 394 'msvs_settings': {
395 'VCLinkerTool': { 395 'VCLinkerTool': {
396 'LinkTimeCodeGeneration': '3', 396 'LinkTimeCodeGeneration': '3',
397 }, 397 },
398 }, 398 },
399 }], 399 }],
400 ] 400 ]
401 }], 401 }],
402 ['OS=="win" and configuration_policy==1', {
403 'dependencies': [
404 '<(DEPTH)/components/components.gyp:policy',
405 ],
406 }],
407 ['configuration_policy==1', {
408 'dependencies': [
409 'policy_path_parser',
410 ],
411 }],
402 ['enable_plugins==1', { 412 ['enable_plugins==1', {
403 'dependencies': [ 413 'dependencies': [
404 '../pdf/pdf.gyp:pdf', 414 '../pdf/pdf.gyp:pdf',
405 ], 415 ],
406 }], 416 }],
407 ], 417 ],
408 }, # target chrome_child_dll 418 }, # target chrome_child_dll
409 ], 419 ],
410 }], 420 }],
411 ], 421 ],
412 } 422 }
OLDNEW
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698