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

Side by Side Diff: cc/cc.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, 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 | 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 'cc_source_files': [ 7 'cc_source_files': [
8 'animation/animation.cc', 8 'animation/animation.cc',
9 'animation/animation.h', 9 'animation/animation.h',
10 'animation/animation_curve.cc', 10 'animation/animation_curve.cc',
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 'quads/yuv_video_draw_quad.cc', 339 'quads/yuv_video_draw_quad.cc',
340 'quads/yuv_video_draw_quad.h', 340 'quads/yuv_video_draw_quad.h',
341 ], 341 ],
342 'conditions': [ 342 'conditions': [
343 ['inside_chromium_build==1', { 343 ['inside_chromium_build==1', {
344 'webkit_src_dir': '<(DEPTH)/third_party/WebKit', 344 'webkit_src_dir': '<(DEPTH)/third_party/WebKit',
345 }, { 345 }, {
346 'webkit_src_dir': '<(DEPTH)/../../..', 346 'webkit_src_dir': '<(DEPTH)/../../..',
347 }], 347 }],
348 ], 348 ],
349 'chromium_code': 1,
jamesr 2013/03/29 00:07:16 nit: could you put this at the top of the variable
danakj 2013/03/29 00:17:35 Done.
349 }, 350 },
350 'conditions': [ 351 'conditions': [
351 ['inside_chromium_build==0', { 352 ['inside_chromium_build==0', {
352 'defines': [ 353 'defines': [
353 'INSIDE_WEBKIT_BUILD=1', 354 'INSIDE_WEBKIT_BUILD=1',
354 ], 355 ],
355 }], 356 }],
356 ], 357 ],
357 'targets': [ 358 'targets': [
358 { 359 {
(...skipping 14 matching lines...) Expand all
373 'CC_IMPLEMENTATION=1', 374 'CC_IMPLEMENTATION=1',
374 ], 375 ],
375 'sources': [ 376 'sources': [
376 '<@(cc_source_files)', 377 '<@(cc_source_files)',
377 ], 378 ],
378 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 379 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
379 'msvs_disabled_warnings': [ 4267, ], 380 'msvs_disabled_warnings': [ 4267, ],
380 }, 381 },
381 ], 382 ],
382 } 383 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698