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

Side by Side Diff: base/base.gyp

Issue 1855483004: [iOS/OS X] Allow base::scoped_nsobject<> to be used when ARC is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert changes to build/config/compiler/BUILD.gn 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
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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 ['OS == "ios" and _toolset != "host"', { 214 ['OS == "ios" and _toolset != "host"', {
215 'link_settings': { 215 'link_settings': {
216 'libraries': [ 216 'libraries': [
217 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', 217 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
218 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', 218 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework',
219 '$(SDKROOT)/System/Library/Frameworks/CoreText.framework', 219 '$(SDKROOT)/System/Library/Frameworks/CoreText.framework',
220 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 220 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
221 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', 221 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
222 ], 222 ],
223 }, 223 },
224 'sources/': [
225 ['include', '^mac/scoped_block\\.mm$'],
226 ['include', '^mac/scoped_nsobject\\.mm$'],
227 ],
224 }], 228 }],
225 ['OS != "win" and (OS != "ios" or _toolset == "host")', { 229 ['OS != "win" and (OS != "ios" or _toolset == "host")', {
226 'dependencies': ['third_party/libevent/libevent.gyp:libevent'], 230 'dependencies': ['third_party/libevent/libevent.gyp:libevent'],
227 },], 231 },],
228 ['component=="shared_library"', { 232 ['component=="shared_library"', {
229 'conditions': [ 233 'conditions': [
230 ['OS=="win"', { 234 ['OS=="win"', {
231 'sources!': [ 235 'sources!': [
232 'debug/debug_on_start_win.cc', 236 'debug/debug_on_start_win.cc',
233 ], 237 ],
(...skipping 1490 matching lines...) Expand 10 before | Expand all | Expand 10 after
1724 '../build/isolate.gypi', 1728 '../build/isolate.gypi',
1725 ], 1729 ],
1726 'sources': [ 1730 'sources': [
1727 'base_unittests.isolate', 1731 'base_unittests.isolate',
1728 ], 1732 ],
1729 }, 1733 },
1730 ], 1734 ],
1731 }], 1735 }],
1732 ], 1736 ],
1733 } 1737 }
OLDNEW
« no previous file with comments | « base/BUILD.gn ('k') | base/base.gypi » ('j') | base/mac/scoped_block.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698