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

Side by Side Diff: content/content_common.gypi

Issue 23882006: Fix a compilation error with order_profiling=1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 | no next file » | 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 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../components/tracing.gyp:tracing', 8 '../components/tracing.gyp:tracing',
9 '../net/net.gyp:net', 9 '../net/net.gyp:net',
10 '../skia/skia.gyp:skia', 10 '../skia/skia.gyp:skia',
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 'link_settings': { 419 'link_settings': {
420 'libraries': [ 420 'libraries': [
421 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 421 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
422 ], 422 ],
423 }, 423 },
424 }], 424 }],
425 ['OS=="android"',{ 425 ['OS=="android"',{
426 'sources!': [ 426 'sources!': [
427 'common/font_list.cc', 427 'common/font_list.cc',
428 'common/sandbox_util.cc', 428 'common/sandbox_util.cc',
429 'public/common/child_process_host_delegate.cc',
430 ], 429 ],
431 'link_settings': { 430 'link_settings': {
432 'libraries': [ 431 'libraries': [
433 '-landroid', # ANativeWindow 432 '-landroid', # ANativeWindow
434 ], 433 ],
435 }, 434 },
436 'dependencies': [ 435 'dependencies': [
437 'content.gyp:content_jni_headers', 436 'content.gyp:content_jni_headers',
438 'content.gyp:common_aidl', 437 'content.gyp:common_aidl',
439 ], 438 ],
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', 580 '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
582 '<(output)', 581 '<(output)',
583 '<(PRODUCT_DIR)', 582 '<(PRODUCT_DIR)',
584 ], 583 ],
585 'msvs_cygwin_shell': 1, 584 'msvs_cygwin_shell': 1,
586 }, 585 },
587 ] 586 ]
588 }], 587 }],
589 ], 588 ],
590 } 589 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698