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

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: resolved Yuncheol's comment 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
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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 'common/edit_command.h', 166 'common/edit_command.h',
167 'common/file_utilities_messages.h', 167 'common/file_utilities_messages.h',
168 'common/fileapi/file_system_messages.h', 168 'common/fileapi/file_system_messages.h',
169 'common/fileapi/webblob_messages.h', 169 'common/fileapi/webblob_messages.h',
170 'common/font_cache_dispatcher_win.cc', 170 'common/font_cache_dispatcher_win.cc',
171 'common/font_cache_dispatcher_win.h', 171 'common/font_cache_dispatcher_win.h',
172 'common/font_config_ipc_linux.cc', 172 'common/font_config_ipc_linux.cc',
173 'common/font_config_ipc_linux.h', 173 'common/font_config_ipc_linux.h',
174 'common/font_list.cc', 174 'common/font_list.cc',
175 'common/font_list.h', 175 'common/font_list.h',
176 'common/font_list_android.cc',
176 'common/font_list_mac.mm', 177 'common/font_list_mac.mm',
177 'common/font_list_pango.cc', 178 'common/font_list_pango.cc',
178 'common/font_list_win.cc', 179 'common/font_list_win.cc',
179 'common/gamepad_hardware_buffer.h', 180 'common/gamepad_hardware_buffer.h',
180 'common/gamepad_messages.h', 181 'common/gamepad_messages.h',
181 'common/gamepad_user_gesture.cc', 182 'common/gamepad_user_gesture.cc',
182 'common/gamepad_user_gesture.h', 183 'common/gamepad_user_gesture.h',
183 'common/geolocation_messages.h', 184 'common/geolocation_messages.h',
184 'common/gpu/client/command_buffer_proxy_impl.cc', 185 'common/gpu/client/command_buffer_proxy_impl.cc',
185 'common/gpu/client/command_buffer_proxy_impl.h', 186 'common/gpu/client/command_buffer_proxy_impl.h',
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 'common/plugin_list_posix.cc', 418 'common/plugin_list_posix.cc',
418 ], 419 ],
419 'link_settings': { 420 'link_settings': {
420 'libraries': [ 421 'libraries': [
421 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 422 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
422 ], 423 ],
423 }, 424 },
424 }], 425 }],
425 ['OS=="android"',{ 426 ['OS=="android"',{
426 'sources!': [ 427 'sources!': [
427 'common/font_list.cc',
428 'common/sandbox_util.cc',
429 'public/common/child_process_host_delegate.cc', 428 'public/common/child_process_host_delegate.cc',
430 ], 429 ],
430 'conditions': [
431 ['enable_plugins!=1', {
jam 2013/09/06 16:22:51 ditto
kjyoun 2013/09/10 02:21:25 Done.
432 'sources!' : [
433 'common/font_list.cc',
434 'common/font_list_android.cc',
435 'common/sandbox_util.cc',
436 ],
437 }],
438 ],
431 'link_settings': { 439 'link_settings': {
432 'libraries': [ 440 'libraries': [
433 '-landroid', # ANativeWindow 441 '-landroid', # ANativeWindow
434 ], 442 ],
435 }, 443 },
436 'dependencies': [ 444 'dependencies': [
437 'content.gyp:content_jni_headers', 445 'content.gyp:content_jni_headers',
438 'content.gyp:common_aidl', 446 'content.gyp:common_aidl',
439 ], 447 ],
440 }], 448 }],
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', 589 '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
582 '<(output)', 590 '<(output)',
583 '<(PRODUCT_DIR)', 591 '<(PRODUCT_DIR)',
584 ], 592 ],
585 'msvs_cygwin_shell': 1, 593 'msvs_cygwin_shell': 1,
586 }, 594 },
587 ] 595 ]
588 }], 596 }],
589 ], 597 ],
590 } 598 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698