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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 284493002: Fix policy_component shared_library link without configuration_policy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Put policy_pref_names.cc in two separate sources list Created 6 years, 7 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 | « no previous file | 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 ['OS=="mac" or OS=="win"', { 6 ['OS=="mac" or OS=="win"', {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'chrome_dll', 9 'target_name': 'chrome_dll',
10 'type': 'none', 10 'type': 'none',
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 ] 71 ]
72 }, 72 },
73 { 73 {
74 'target_name': 'chrome_main_dll', 74 'target_name': 'chrome_main_dll',
75 'type': 'shared_library', 75 'type': 'shared_library',
76 'variables': { 76 'variables': {
77 'enable_wexit_time_destructors': 1, 77 'enable_wexit_time_destructors': 1,
78 }, 78 },
79 'dependencies': [ 79 'dependencies': [
80 '<@(chromium_browser_dependencies)', 80 '<@(chromium_browser_dependencies)',
81 '../components/components.gyp:policy',
82 '../content/content.gyp:content_app_browser', 81 '../content/content.gyp:content_app_browser',
83 ], 82 ],
84 'conditions': [ 83 'conditions': [
85 ['OS=="win"', { 84 ['OS=="win"', {
86 'dependencies': [ 85 'dependencies': [
87 '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf', 86 '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf',
88 ], 87 ],
89 }], 88 }],
89 ['OS=="win" and configuration_policy==1', {
90 'dependencies': [
91 '<(DEPTH)/components/components.gyp:policy',
92 ],
93 }],
90 ['use_aura==1', { 94 ['use_aura==1', {
91 'dependencies': [ 95 'dependencies': [
92 '../ui/compositor/compositor.gyp:compositor', 96 '../ui/compositor/compositor.gyp:compositor',
93 ], 97 ],
94 }], 98 }],
95 ['OS=="win" and target_arch=="ia32"', { 99 ['OS=="win" and target_arch=="ia32"', {
96 # Add a dependency to custom import library for user32 delay 100 # Add a dependency to custom import library for user32 delay
97 # imports only in x86 builds. 101 # imports only in x86 builds.
98 'dependencies': [ 102 'dependencies': [
99 'chrome_user32_delay_imports', 103 'chrome_user32_delay_imports',
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 }, 399 },
396 }], 400 }],
397 ] 401 ]
398 }], 402 }],
399 ], 403 ],
400 }, # target chrome_child_dll 404 }, # target chrome_child_dll
401 ], 405 ],
402 }], 406 }],
403 ], 407 ],
404 } 408 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698