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

Side by Side Diff: base/base.gyp

Issue 16876006: ios: keep scoped_nsobject in source lists. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « no previous file | base/base.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 796 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 ], 807 ],
808 }], 808 }],
809 ], # conditions 809 ], # conditions
810 'target_conditions': [ 810 'target_conditions': [
811 ['OS == "ios" and _toolset != "host"', { 811 ['OS == "ios" and _toolset != "host"', {
812 'sources/': [ 812 'sources/': [
813 # Pull in specific Mac files for iOS (which have been filtered out 813 # Pull in specific Mac files for iOS (which have been filtered out
814 # by file name rules). 814 # by file name rules).
815 ['include', '^mac/objc_property_releaser_unittest\\.mm$'], 815 ['include', '^mac/objc_property_releaser_unittest\\.mm$'],
816 ['include', '^mac/bind_objc_block_unittest\\.mm$'], 816 ['include', '^mac/bind_objc_block_unittest\\.mm$'],
817 ['include', '^mac/scoped_nsobject_unittest\\.mm$'],
817 ['include', '^sys_string_conversions_mac_unittest\\.mm$'], 818 ['include', '^sys_string_conversions_mac_unittest\\.mm$'],
818 ], 819 ],
819 }], 820 }],
820 ], # target_conditions 821 ], # target_conditions
821 }, 822 },
822 { 823 {
823 'target_name': 'test_support_base', 824 'target_name': 'test_support_base',
824 'type': 'static_library', 825 'type': 'static_library',
825 'dependencies': [ 826 'dependencies': [
826 'base', 827 'base',
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
1297 'base_unittests.isolate', 1298 'base_unittests.isolate',
1298 ], 1299 ],
1299 'sources': [ 1300 'sources': [
1300 'base_unittests.isolate', 1301 'base_unittests.isolate',
1301 ], 1302 ],
1302 }, 1303 },
1303 ], 1304 ],
1304 }], 1305 }],
1305 ], 1306 ],
1306 } 1307 }
OLDNEW
« no previous file with comments | « no previous file | base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698