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

Side by Side Diff: chrome/chrome_browser_ui.gypi

Issue 1462853002: [clean-up] Remove allocator.gyp dependency from library targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add to chrome_child_dll 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_extensions.gypi ('k') | chrome/chrome_dll.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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 'variables': { 6 'variables': {
7 # There are two sections of sources: 7 # There are two sections of sources:
8 # * "Platform"-based sources (OS, toolkit, etc.) 8 # * "Platform"-based sources (OS, toolkit, etc.)
9 # * Feature/directory-based sources (e.g., history, printing) 9 # * Feature/directory-based sources (e.g., history, printing)
10 10
(...skipping 3113 matching lines...) Expand 10 before | Expand all | Expand 10 after
3124 'export_dependent_settings': [ 3124 'export_dependent_settings': [
3125 '../ui/views/controls/webview/webview.gyp:webview', 3125 '../ui/views/controls/webview/webview.gyp:webview',
3126 '../ui/views/views.gyp:views', 3126 '../ui/views/views.gyp:views',
3127 ], 3127 ],
3128 'sources': [ '<@(chrome_browser_ui_win_sources)' ], 3128 'sources': [ '<@(chrome_browser_ui_win_sources)' ],
3129 'sources!': [ 3129 'sources!': [
3130 'browser/ui/views/apps/keyboard_hook_handler.cc', 3130 'browser/ui/views/apps/keyboard_hook_handler.cc',
3131 'browser/ui/views/frame/taskbar_decorator.cc' 3131 'browser/ui/views/frame/taskbar_decorator.cc'
3132 ], 3132 ],
3133 'conditions': [ 3133 'conditions': [
3134 ['win_use_allocator_shim==1', {
3135 'dependencies': [
3136 '<(allocator_target)',
3137 ],
3138 }],
3139 ['branding!="Chrome"', { 3134 ['branding!="Chrome"', {
3140 'dependencies!': [ 3135 'dependencies!': [
3141 '../google_update/google_update.gyp:google_update', 3136 '../google_update/google_update.gyp:google_update',
3142 ], 3137 ],
3143 'sources!': [ 3138 'sources!': [
3144 'browser/ui/webui/help/version_updater_win.cc', 3139 'browser/ui/webui/help/version_updater_win.cc',
3145 ], 3140 ],
3146 'sources': [ 3141 'sources': [
3147 'browser/ui/webui/help/version_updater_basic.cc', 3142 'browser/ui/webui/help/version_updater_basic.cc',
3148 'browser/ui/webui/help/version_updater_basic.h', 3143 'browser/ui/webui/help/version_updater_basic.h',
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
3271 ], 3266 ],
3272 'sources': [ 3267 'sources': [
3273 '<@(chrome_browser_ui_non_mobile_sources)', 3268 '<@(chrome_browser_ui_non_mobile_sources)',
3274 '<@(chrome_browser_ui_omnibox_non_mobile_sources)', 3269 '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
3275 ], 3270 ],
3276 }], 3271 }],
3277 ], 3272 ],
3278 }, 3273 },
3279 ], 3274 ],
3280 } 3275 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_extensions.gypi ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698