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

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 unused function in Android. 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 3302 matching lines...) Expand 10 before | Expand all | Expand 10 after
3313 # chrome/browser/metrics/variations/generate_resources_map.py 3313 # chrome/browser/metrics/variations/generate_resources_map.py
3314 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/genera ted_resources_map.cc', 3314 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/genera ted_resources_map.cc',
3315 ], 3315 ],
3316 'conditions': [ 3316 'conditions': [
3317 ['toolkit_views==1', { 3317 ['toolkit_views==1', {
3318 'dependencies': [ 3318 'dependencies': [
3319 '../ui/gfx/gfx.gyp:gfx_vector_icons', 3319 '../ui/gfx/gfx.gyp:gfx_vector_icons',
3320 '../ui/views/views.gyp:views' 3320 '../ui/views/views.gyp:views'
3321 ], 3321 ],
3322 }], 3322 }],
3323 ['OS=="android"', {
3324 'dependencies': [
3325 '../third_party/boringssl/boringssl.gyp:boringssl',
davidben 2015/10/13 20:32:15 Corresponding change in chrome/browser/BUILD.gn
svaldez 2015/10/14 15:06:18 Done.
3326 ],
3327 }]
3323 ], 3328 ],
3324 }, { # OS == "ios" 3329 }, { # OS == "ios"
3325 'dependencies': [ 3330 'dependencies': [
3326 '../net/net.gyp:net', 3331 '../net/net.gyp:net',
3327 ], 3332 ],
3328 # A few sources had been brought up for iOS before the decision not to 3333 # A few sources had been brought up for iOS before the decision not to
3329 # use chrome/ for iOS long-term. Keep building them to prevent iOS 3334 # use chrome/ for iOS long-term. Keep building them to prevent iOS
3330 # regressions until they have been componentized. 3335 # regressions until they have been componentized.
3331 'sources': [ 3336 'sources': [
3332 '<@(chrome_browser_ios_sources)', 3337 '<@(chrome_browser_ios_sources)',
(...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
4105 '../components/components.gyp:omnibox_browser', 4110 '../components/components.gyp:omnibox_browser',
4106 '../components/components.gyp:rlz', 4111 '../components/components.gyp:rlz',
4107 '../components/components.gyp:search_engines', 4112 '../components/components.gyp:search_engines',
4108 '../rlz/rlz.gyp:rlz_lib', 4113 '../rlz/rlz.gyp:rlz_lib',
4109 ], 4114 ],
4110 }, 4115 },
4111 ], 4116 ],
4112 }], 4117 }],
4113 ], 4118 ],
4114 } 4119 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698