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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 108513011: Move chrome/app/policy into components/policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/chrome_dll_bundle.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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 ] 73 ]
74 }, 74 },
75 { 75 {
76 'target_name': 'chrome_main_dll', 76 'target_name': 'chrome_main_dll',
77 'type': 'shared_library', 77 'type': 'shared_library',
78 'variables': { 78 'variables': {
79 'enable_wexit_time_destructors': 1, 79 'enable_wexit_time_destructors': 1,
80 }, 80 },
81 'dependencies': [ 81 'dependencies': [
82 '<@(chromium_browser_dependencies)', 82 '<@(chromium_browser_dependencies)',
83 '../components/components.gyp:policy',
83 '../content/content.gyp:content_app_browser', 84 '../content/content.gyp:content_app_browser',
84 'app/policy/cloud_policy_codegen.gyp:policy',
85 ], 85 ],
86 'conditions': [ 86 'conditions': [
87 ['use_aura==1', { 87 ['use_aura==1', {
88 'dependencies': [ 88 'dependencies': [
89 '../ui/compositor/compositor.gyp:compositor', 89 '../ui/compositor/compositor.gyp:compositor',
90 ], 90 ],
91 }], 91 }],
92 ['OS=="win" and target_arch=="ia32" and MSVS_VERSION!="2013"', { 92 ['OS=="win" and target_arch=="ia32" and MSVS_VERSION!="2013"', {
93 # TODO(scottmg): The assembler is very broken in VS2013 and 93 # TODO(scottmg): The assembler is very broken in VS2013 and
94 # crashes on the generated .asm file, so disable this for now. 94 # crashes on the generated .asm file, so disable this for now.
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 '_ChromeMain', 282 '_ChromeMain',
283 '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}', 283 '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}',
284 ], 284 ],
285 }, 285 },
286 ], 286 ],
287 'conditions': [ 287 'conditions': [
288 ['mac_breakpad_compiled_in==1', { 288 ['mac_breakpad_compiled_in==1', {
289 'dependencies': [ 289 'dependencies': [
290 '../breakpad/breakpad.gyp:breakpad', 290 '../breakpad/breakpad.gyp:breakpad',
291 '../components/components.gyp:breakpad_component', 291 '../components/components.gyp:breakpad_component',
292 'app/policy/cloud_policy_codegen.gyp:policy', 292 '../components/components.gyp:policy',
293 ], 293 ],
294 'sources': [ 294 'sources': [
295 'app/chrome_breakpad_client.cc', 295 'app/chrome_breakpad_client.cc',
296 'app/chrome_breakpad_client.h', 296 'app/chrome_breakpad_client.h',
297 'app/chrome_breakpad_client_mac.mm', 297 'app/chrome_breakpad_client_mac.mm',
298 ], 298 ],
299 }, { # else: mac_breakpad_compiled_in!=1 299 }, { # else: mac_breakpad_compiled_in!=1
300 # No Breakpad, put in the stubs. 300 # No Breakpad, put in the stubs.
301 'dependencies': [ 301 'dependencies': [
302 '../components/components.gyp:breakpad_stubs', 302 '../components/components.gyp:breakpad_stubs',
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', 361 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
362 'app/chrome_main.cc', 362 'app/chrome_main.cc',
363 'app/chrome_main_delegate.cc', 363 'app/chrome_main_delegate.cc',
364 'app/chrome_main_delegate.h', 364 'app/chrome_main_delegate.h',
365 ], 365 ],
366 }, # target chrome_child_dll 366 }, # target chrome_child_dll
367 ], 367 ],
368 }], 368 }],
369 ], 369 ],
370 } 370 }
OLDNEW
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/chrome_dll_bundle.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698