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

Side by Side Diff: content/content_common.gypi

Issue 23978005: Fix build breakage on chrome-for-tv (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
« no previous file with comments | « content/common/font_list_android.cc ('k') | content/content_renderer.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 '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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 'common/edit_command.h', 165 'common/edit_command.h',
166 'common/file_utilities_messages.h', 166 'common/file_utilities_messages.h',
167 'common/fileapi/file_system_messages.h', 167 'common/fileapi/file_system_messages.h',
168 'common/fileapi/webblob_messages.h', 168 'common/fileapi/webblob_messages.h',
169 'common/font_cache_dispatcher_win.cc', 169 'common/font_cache_dispatcher_win.cc',
170 'common/font_cache_dispatcher_win.h', 170 'common/font_cache_dispatcher_win.h',
171 'common/font_config_ipc_linux.cc', 171 'common/font_config_ipc_linux.cc',
172 'common/font_config_ipc_linux.h', 172 'common/font_config_ipc_linux.h',
173 'common/font_list.cc', 173 'common/font_list.cc',
174 'common/font_list.h', 174 'common/font_list.h',
175 'common/font_list_android.cc',
175 'common/font_list_mac.mm', 176 'common/font_list_mac.mm',
176 'common/font_list_pango.cc', 177 'common/font_list_pango.cc',
177 'common/font_list_win.cc', 178 'common/font_list_win.cc',
178 'common/gamepad_hardware_buffer.h', 179 'common/gamepad_hardware_buffer.h',
179 'common/gamepad_messages.h', 180 'common/gamepad_messages.h',
180 'common/gamepad_user_gesture.cc', 181 'common/gamepad_user_gesture.cc',
181 'common/gamepad_user_gesture.h', 182 'common/gamepad_user_gesture.h',
182 'common/geolocation_messages.h', 183 'common/geolocation_messages.h',
183 'common/gpu/client/command_buffer_proxy_impl.cc', 184 'common/gpu/client/command_buffer_proxy_impl.cc',
184 'common/gpu/client/command_buffer_proxy_impl.h', 185 'common/gpu/client/command_buffer_proxy_impl.h',
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 'sources!': [ 428 'sources!': [
428 'common/plugin_list_posix.cc', 429 'common/plugin_list_posix.cc',
429 ], 430 ],
430 'link_settings': { 431 'link_settings': {
431 'libraries': [ 432 'libraries': [
432 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 433 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
433 ], 434 ],
434 }, 435 },
435 }], 436 }],
436 ['OS=="android"',{ 437 ['OS=="android"',{
437 'sources!': [
438 'common/font_list.cc',
439 'common/sandbox_util.cc',
440 ],
441 'link_settings': { 438 'link_settings': {
442 'libraries': [ 439 'libraries': [
443 '-landroid', # ANativeWindow 440 '-landroid', # ANativeWindow
444 ], 441 ],
445 }, 442 },
446 'dependencies': [ 443 'dependencies': [
447 'content.gyp:content_jni_headers', 444 'content.gyp:content_jni_headers',
448 'content.gyp:common_aidl', 445 'content.gyp:common_aidl',
449 ], 446 ],
450 }], 447 }],
(...skipping 26 matching lines...) Expand all
477 'common/gpu/x_util.cc', 474 'common/gpu/x_util.cc',
478 'common/gpu/x_util.h', 475 'common/gpu/x_util.h',
479 ], 476 ],
480 }], 477 }],
481 ['enable_plugins==1', { 478 ['enable_plugins==1', {
482 'dependencies': [ 479 'dependencies': [
483 '../ppapi/ppapi_internal.gyp:ppapi_shared', 480 '../ppapi/ppapi_internal.gyp:ppapi_shared',
484 ], 481 ],
485 }, { # enable_plugins == 0 482 }, { # enable_plugins == 0
486 'sources!': [ 483 'sources!': [
484 'common/font_list.cc',
485 'common/sandbox_util.cc',
jam 2013/09/10 15:36:35 nit: order
kjyoun 2013/09/10 22:49:35 Done.
487 'common/pepper_plugin_list.cc', 486 'common/pepper_plugin_list.cc',
488 'common/pepper_plugin_list.h', 487 'common/pepper_plugin_list.h',
489 ], 488 ],
490 }], 489 }],
491 ['enable_gpu==1', { 490 ['enable_gpu==1', {
492 'dependencies': [ 491 'dependencies': [
493 '../gpu/gpu.gyp:command_buffer_service', 492 '../gpu/gpu.gyp:command_buffer_service',
494 ], 493 ],
495 }], 494 }],
496 ['OS=="android"', { 495 ['OS=="android"', {
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', 590 '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
592 '<(output)', 591 '<(output)',
593 '<(PRODUCT_DIR)', 592 '<(PRODUCT_DIR)',
594 ], 593 ],
595 'msvs_cygwin_shell': 1, 594 'msvs_cygwin_shell': 1,
596 }, 595 },
597 ] 596 ]
598 }], 597 }],
599 ], 598 ],
600 } 599 }
OLDNEW
« no previous file with comments | « content/common/font_list_android.cc ('k') | content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698