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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 1304143010: Plumbing SSLPrivateKey Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing upload and refptr. Created 5 years, 2 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
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 # All .cc, .h, .m, and .mm files under browser except for: 7 # All .cc, .h, .m, and .mm files under browser except for:
8 # * tests and mocks. 8 # * tests and mocks.
9 # * code below browser/chromeos 9 # * code below browser/chromeos
10 # * code below browser/extensions 10 # * code below browser/extensions
(...skipping 3303 matching lines...) Expand 10 before | Expand all | Expand 10 after
3314 '<(grit_out_dir)/grit/settings_resources_map.cc', 3314 '<(grit_out_dir)/grit/settings_resources_map.cc',
3315 '<(grit_out_dir)/grit/theme_resources_map.cc', 3315 '<(grit_out_dir)/grit/theme_resources_map.cc',
3316 ], 3316 ],
3317 'conditions': [ 3317 'conditions': [
3318 ['toolkit_views==1', { 3318 ['toolkit_views==1', {
3319 'dependencies': [ 3319 'dependencies': [
3320 '../ui/gfx/gfx.gyp:gfx_vector_icons', 3320 '../ui/gfx/gfx.gyp:gfx_vector_icons',
3321 '../ui/views/views.gyp:views' 3321 '../ui/views/views.gyp:views'
3322 ], 3322 ],
3323 }], 3323 }],
3324 ['OS=="android"', {
3325 'dependencies': [
3326 '../third_party/boringssl/boringssl.gyp:boringssl',
3327 ],
3328 }]
3324 ], 3329 ],
3325 }, { # OS == "ios" 3330 }, { # OS == "ios"
3326 'dependencies': [ 3331 'dependencies': [
3327 '../net/net.gyp:net', 3332 '../net/net.gyp:net',
3328 ], 3333 ],
3329 # A few sources had been brought up for iOS before the decision not to 3334 # A few sources had been brought up for iOS before the decision not to
3330 # use chrome/ for iOS long-term. Keep building them to prevent iOS 3335 # use chrome/ for iOS long-term. Keep building them to prevent iOS
3331 # regressions until they have been componentized. 3336 # regressions until they have been componentized.
3332 'sources': [ 3337 'sources': [
3333 '<@(chrome_browser_ios_sources)', 3338 '<@(chrome_browser_ios_sources)',
(...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
4119 '../components/components.gyp:omnibox_browser', 4124 '../components/components.gyp:omnibox_browser',
4120 '../components/components.gyp:rlz', 4125 '../components/components.gyp:rlz',
4121 '../components/components.gyp:search_engines', 4126 '../components/components.gyp:search_engines',
4122 '../rlz/rlz.gyp:rlz_lib', 4127 '../rlz/rlz.gyp:rlz_lib',
4123 ], 4128 ],
4124 }, 4129 },
4125 ], 4130 ],
4126 }], 4131 }],
4127 ], 4132 ],
4128 } 4133 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698