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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 1864693002: Stop weak linking CoreImage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « no previous file | no next file » | 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 # 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 3398 matching lines...) Expand 10 before | Expand all | Expand 10 after
3409 ], 3409 ],
3410 # A few sources had been brought up for iOS before the decision not to 3410 # A few sources had been brought up for iOS before the decision not to
3411 # use chrome/ for iOS long-term. Keep building them to prevent iOS 3411 # use chrome/ for iOS long-term. Keep building them to prevent iOS
3412 # regressions until they have been componentized. 3412 # regressions until they have been componentized.
3413 'sources': [ 3413 'sources': [
3414 '<@(chrome_browser_ios_sources)', 3414 '<@(chrome_browser_ios_sources)',
3415 '<@(chrome_browser_google_sources)', 3415 '<@(chrome_browser_google_sources)',
3416 ], 3416 ],
3417 'link_settings': { 3417 'link_settings': {
3418 'libraries': [ 3418 'libraries': [
3419 '$(SDKROOT)/System/Library/Frameworks/CoreImage.framework',
3419 '$(SDKROOT)/System/Library/Frameworks/CoreTelephony.framework', 3420 '$(SDKROOT)/System/Library/Frameworks/CoreTelephony.framework',
3420 '$(SDKROOT)/System/Library/Frameworks/CoreText.framework', 3421 '$(SDKROOT)/System/Library/Frameworks/CoreText.framework',
3421 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework ', 3422 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework ',
3422 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 3423 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
3423 ], 3424 ],
3424 # CoreImage is iOS 5+, but iOS 4.3 is still supported.
3425 'xcode_settings': {'OTHER_LDFLAGS': ['-weak_framework CoreImage']},
3426 }, 3425 },
3427 }], 3426 }],
3428 ['OS=="win" or OS=="mac"', { 3427 ['OS=="win" or OS=="mac"', {
3429 'sources': [ 3428 'sources': [
3430 '<@(chrome_browser_win_mac_sources)', 3429 '<@(chrome_browser_win_mac_sources)',
3431 ], 3430 ],
3432 }], 3431 }],
3433 ['OS!="win" and OS!="mac" and OS!="ios"', { 3432 ['OS!="win" and OS!="mac" and OS!="ios"', {
3434 'sources': [ 3433 'sources': [
3435 'browser/net/net_error_diagnostics_dialog_generic.cc', 3434 'browser/net/net_error_diagnostics_dialog_generic.cc',
(...skipping 766 matching lines...) Expand 10 before | Expand all | Expand 10 after
4202 '../components/components.gyp:rlz', 4201 '../components/components.gyp:rlz',
4203 '../components/components.gyp:search_engines', 4202 '../components/components.gyp:search_engines',
4204 '../rlz/rlz.gyp:rlz_lib', 4203 '../rlz/rlz.gyp:rlz_lib',
4205 'common', 4204 'common',
4206 ], 4205 ],
4207 }, 4206 },
4208 ], 4207 ],
4209 }], 4208 }],
4210 ], 4209 ],
4211 } 4210 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698