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

Side by Side Diff: content/content_common.gypi

Issue 19002008: Revert "Remove dependencies on /media for iOS." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | « content/browser/browser_main_loop.cc ('k') | content/content_tests.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 '../media/media.gyp:media',
9 '../net/net.gyp:net', 10 '../net/net.gyp:net',
10 '../skia/skia.gyp:skia', 11 '../skia/skia.gyp:skia',
11 '../third_party/icu/icu.gyp:icuuc', 12 '../third_party/icu/icu.gyp:icuuc',
12 '../ui/ui.gyp:shell_dialogs', 13 '../ui/ui.gyp:shell_dialogs',
13 '../ui/ui.gyp:ui', 14 '../ui/ui.gyp:ui',
14 '../url/url.gyp:url_lib', 15 '../url/url.gyp:url_lib',
15 '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent', 16 '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
16 ], 17 ],
17 'include_dirs': [ 18 'include_dirs': [
18 '..', 19 '..',
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 ['include', '^common/savable_url_schemes\\.cc$'], 369 ['include', '^common/savable_url_schemes\\.cc$'],
369 ['include', '^common/url_schemes\\.cc$'], 370 ['include', '^common/url_schemes\\.cc$'],
370 ], 371 ],
371 }, { # OS!="ios" 372 }, { # OS!="ios"
372 'dependencies': [ 373 'dependencies': [
373 '../cc/cc.gyp:cc', 374 '../cc/cc.gyp:cc',
374 '../gpu/gpu.gyp:gles2_c_lib', 375 '../gpu/gpu.gyp:gles2_c_lib',
375 '../gpu/gpu.gyp:gles2_implementation', 376 '../gpu/gpu.gyp:gles2_implementation',
376 '../gpu/gpu.gyp:gpu_ipc', 377 '../gpu/gpu.gyp:gpu_ipc',
377 '../ipc/ipc.gyp:ipc', 378 '../ipc/ipc.gyp:ipc',
378 '../media/media.gyp:media',
379 '../media/media.gyp:shared_memory_support', 379 '../media/media.gyp:shared_memory_support',
380 '../third_party/WebKit/public/blink.gyp:blink', 380 '../third_party/WebKit/public/blink.gyp:blink',
381 '../ui/gl/gl.gyp:gl', 381 '../ui/gl/gl.gyp:gl',
382 '../webkit/common/webkit_common.gyp:webkit_common', 382 '../webkit/common/webkit_common.gyp:webkit_common',
383 '../webkit/storage_browser.gyp:webkit_storage_browser', 383 '../webkit/storage_browser.gyp:webkit_storage_browser',
384 '../webkit/storage_common.gyp:webkit_storage_common', 384 '../webkit/storage_common.gyp:webkit_storage_common',
385 '../webkit/support/webkit_support.gyp:glue', 385 '../webkit/support/webkit_support.gyp:glue',
386 ], 386 ],
387 }], 387 }],
388 ['OS=="android"',{ 388 ['OS=="android"',{
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', 542 '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
543 '<(output)', 543 '<(output)',
544 '<(PRODUCT_DIR)', 544 '<(PRODUCT_DIR)',
545 ], 545 ],
546 'msvs_cygwin_shell': 1, 546 'msvs_cygwin_shell': 1,
547 }, 547 },
548 ] 548 ]
549 }], 549 }],
550 ], 550 ],
551 } 551 }
OLDNEW
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698