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

Side by Side Diff: cc/cc_tests.gyp

Issue 13206004: cc: Fix build issues for adding ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 'variables': { 6 'variables': {
7 'chromium_code': 0, 7 'chromium_code': 0,
8 'cc_unit_tests_source_files': [ 8 'cc_unit_tests_source_files': [
9 'animation/animation_unittest.cc', 9 'animation/animation_unittest.cc',
10 'layers/content_layer_unittest.cc', 10 'layers/content_layer_unittest.cc',
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 'test/render_pass_test_common.h', 137 'test/render_pass_test_common.h',
138 'test/render_pass_test_utils.cc', 138 'test/render_pass_test_utils.cc',
139 'test/render_pass_test_utils.h', 139 'test/render_pass_test_utils.h',
140 'test/scheduler_test_common.cc', 140 'test/scheduler_test_common.cc',
141 'test/scheduler_test_common.h', 141 'test/scheduler_test_common.h',
142 'test/test_web_graphics_context_3d.cc', 142 'test/test_web_graphics_context_3d.cc',
143 'test/test_web_graphics_context_3d.h', 143 'test/test_web_graphics_context_3d.h',
144 'test/tiled_layer_test_common.cc', 144 'test/tiled_layer_test_common.cc',
145 'test/tiled_layer_test_common.h', 145 'test/tiled_layer_test_common.h',
146 ], 146 ],
147 'chromium_code': 1,
jamesr 2013/03/29 00:07:16 we already have 'chromium_code': 0 at the top of t
danakj 2013/03/29 00:17:35 heh, whoops.
147 }, 148 },
148 'targets': [ 149 'targets': [
149 { 150 {
150 'target_name': 'cc_unittests', 151 'target_name': 'cc_unittests',
151 'type': '<(gtest_target_type)', 152 'type': '<(gtest_target_type)',
152 'dependencies': [ 153 'dependencies': [
153 '../base/base.gyp:test_support_base', 154 '../base/base.gyp:test_support_base',
154 '../gpu/gpu.gyp:gpu', 155 '../gpu/gpu.gyp:gpu',
155 '../media/media.gyp:media', 156 '../media/media.gyp:media',
156 '../skia/skia.gyp:skia', 157 '../skia/skia.gyp:skia',
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 'variables': { 291 'variables': {
291 'test_suite_name': 'cc_perftests', 292 'test_suite_name': 'cc_perftests',
292 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)cc_perfte sts<(SHARED_LIB_SUFFIX)', 293 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)cc_perfte sts<(SHARED_LIB_SUFFIX)',
293 }, 294 },
294 'includes': [ '../build/apk_test.gypi' ], 295 'includes': [ '../build/apk_test.gypi' ],
295 }, 296 },
296 ], 297 ],
297 }] 298 }]
298 ], 299 ],
299 } 300 }
OLDNEW
« cc/cc.gyp ('K') | « cc/cc.gyp ('k') | cc/debug/layer_tree_debug_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698