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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 1413153010: Move components/startup_metric_utils/* to components/startup_metric_utils/browser/*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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_browser.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 ['OS=="mac" or OS=="win"', { 6 ['OS=="mac" or OS=="win"', {
7 'targets': [ 7 'targets': [
8 { 8 {
9 # GN version: //chrome:chrome_dll 9 # GN version: //chrome:chrome_dll
10 'target_name': 'chrome_dll', 10 'target_name': 'chrome_dll',
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 { 331 {
332 # GN version: //chrome:chrome_child 332 # GN version: //chrome:chrome_child
333 'target_name': 'chrome_child_dll', 333 'target_name': 'chrome_child_dll',
334 'type': 'shared_library', 334 'type': 'shared_library',
335 'product_name': 'chrome_child', 335 'product_name': 'chrome_child',
336 'variables': { 336 'variables': {
337 'enable_wexit_time_destructors': 1, 337 'enable_wexit_time_destructors': 1,
338 }, 338 },
339 'dependencies': [ 339 'dependencies': [
340 '<@(chromium_child_dependencies)', 340 '<@(chromium_child_dependencies)',
341 # Required by chrome_main_delegate.cc
342 '../components/components.gyp:startup_metric_utils_browser',
gab 2015/10/29 11:57:21 Hmm chrome_child_dll shouldn't depend on browser t
fdoray 2015/10/29 15:04:47 Yes, it was the propagation of the dependency remo
341 '../content/content.gyp:content_app_child', 343 '../content/content.gyp:content_app_child',
342 'chrome_version_resources', 344 'chrome_version_resources',
343 'policy_path_parser', 345 'policy_path_parser',
344 ], 346 ],
345 'defines': [ 347 'defines': [
346 'CHROME_MULTIPLE_DLL_CHILD', 348 'CHROME_MULTIPLE_DLL_CHILD',
347 ], 349 ],
348 'sources': [ 350 'sources': [
349 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc', 351 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
350 'app/chrome_main.cc', 352 'app/chrome_main.cc',
(...skipping 28 matching lines...) Expand all
379 'dependencies': [ 381 'dependencies': [
380 '../pdf/pdf.gyp:pdf', 382 '../pdf/pdf.gyp:pdf',
381 ], 383 ],
382 }], 384 }],
383 ], 385 ],
384 }, # target chrome_child_dll 386 }, # target chrome_child_dll
385 ], 387 ],
386 }], 388 }],
387 ], 389 ],
388 } 390 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698