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

Side by Side Diff: base/base.gypi

Issue 17500005: Move scoped_nsobject from base/memory to base/mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 7 years, 6 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 | Annotate | Revision Log
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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'base_target': 0, 8 'base_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 'mac/scoped_cftyperef.h', 258 'mac/scoped_cftyperef.h',
259 'mac/scoped_ioobject.h', 259 'mac/scoped_ioobject.h',
260 'mac/scoped_ioplugininterface.h', 260 'mac/scoped_ioplugininterface.h',
261 'mac/scoped_launch_data.h', 261 'mac/scoped_launch_data.h',
262 'mac/scoped_mach_port.cc', 262 'mac/scoped_mach_port.cc',
263 'mac/scoped_mach_port.h', 263 'mac/scoped_mach_port.h',
264 'mac/scoped_nsautorelease_pool.h', 264 'mac/scoped_nsautorelease_pool.h',
265 'mac/scoped_nsautorelease_pool.mm', 265 'mac/scoped_nsautorelease_pool.mm',
266 'mac/scoped_nsexception_enabler.h', 266 'mac/scoped_nsexception_enabler.h',
267 'mac/scoped_nsexception_enabler.mm', 267 'mac/scoped_nsexception_enabler.mm',
268 'mac/scoped_nsobject.h',
268 'mac/scoped_sending_event.h', 269 'mac/scoped_sending_event.h',
269 'mac/scoped_sending_event.mm', 270 'mac/scoped_sending_event.mm',
270 'mac/sdk_forward_declarations.h', 271 'mac/sdk_forward_declarations.h',
271 'memory/aligned_memory.cc', 272 'memory/aligned_memory.cc',
272 'memory/aligned_memory.h', 273 'memory/aligned_memory.h',
273 'memory/discardable_memory.cc', 274 'memory/discardable_memory.cc',
274 'memory/discardable_memory.h', 275 'memory/discardable_memory.h',
275 'memory/discardable_memory_android.cc', 276 'memory/discardable_memory_android.cc',
276 'memory/discardable_memory_mac.cc', 277 'memory/discardable_memory_mac.cc',
277 'memory/linked_ptr.h', 278 'memory/linked_ptr.h',
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 }], 724 }],
724 ['OS == "android" and _toolset == "host" and host_os == "linux"', { 725 ['OS == "android" and _toolset == "host" and host_os == "linux"', {
725 'sources/': [ 726 'sources/': [
726 # Pull in specific files for host builds. 727 # Pull in specific files for host builds.
727 ['include', '^threading/platform_thread_linux\\.cc$'], 728 ['include', '^threading/platform_thread_linux\\.cc$'],
728 ], 729 ],
729 }], 730 }],
730 ['OS == "ios" and _toolset != "host"', { 731 ['OS == "ios" and _toolset != "host"', {
731 'sources/': [ 732 'sources/': [
732 # Pull in specific Mac files for iOS (which have been filtered out 733 # Pull in specific Mac files for iOS (which have been filtered out
733 # by file name rules). 734 # by file name rules).
stuartmorgan 2013/06/21 12:41:19 Same here? Not sure why the iOS build didn't break
Mark Mentovai 2013/06/21 13:34:28 stuartmorgan wrote:
734 ['include', '^atomicops_internals_mac\\.'], 735 ['include', '^atomicops_internals_mac\\.'],
735 ['include', '^base_paths_mac\\.'], 736 ['include', '^base_paths_mac\\.'],
736 ['include', '^file_util_mac\\.'], 737 ['include', '^file_util_mac\\.'],
737 ['include', '^file_version_info_mac\\.'], 738 ['include', '^file_version_info_mac\\.'],
738 ['include', '^mac/bundle_locations\\.'], 739 ['include', '^mac/bundle_locations\\.'],
739 ['include', '^mac/foundation_util\\.'], 740 ['include', '^mac/foundation_util\\.'],
740 ['include', '^mac/mac_logging\\.'], 741 ['include', '^mac/mac_logging\\.'],
741 ['include', '^mac/objc_property_releaser\\.'], 742 ['include', '^mac/objc_property_releaser\\.'],
742 ['include', '^mac/scoped_mach_port\\.'], 743 ['include', '^mac/scoped_mach_port\\.'],
743 ['include', '^mac/scoped_nsautorelease_pool\\.'], 744 ['include', '^mac/scoped_nsautorelease_pool\\.'],
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 ['<(use_system_nspr)==1 and >(nacl_untrusted_build)==0', { 848 ['<(use_system_nspr)==1 and >(nacl_untrusted_build)==0', {
848 'sources/': [ 849 'sources/': [
849 ['exclude', '^third_party/nspr/'], 850 ['exclude', '^third_party/nspr/'],
850 ], 851 ],
851 }], 852 }],
852 ], 853 ],
853 }], 854 }],
854 ], 855 ],
855 }, 856 },
856 } 857 }
OLDNEW
« base/base.gyp ('K') | « base/base.gyp ('k') | base/mac/scoped_cftyperef.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698