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

Side by Side Diff: content/content_common.gypi

Issue 18873009: Revert "Revert "Remove dependencies on /media for iOS."" (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Re-upload patch 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/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',
10 '../net/net.gyp:net', 9 '../net/net.gyp:net',
11 '../skia/skia.gyp:skia', 10 '../skia/skia.gyp:skia',
12 '../third_party/icu/icu.gyp:icuuc', 11 '../third_party/icu/icu.gyp:icuuc',
13 '../ui/ui.gyp:shell_dialogs', 12 '../ui/ui.gyp:shell_dialogs',
14 '../ui/ui.gyp:ui', 13 '../ui/ui.gyp:ui',
15 '../url/url.gyp:url_lib', 14 '../url/url.gyp:url_lib',
16 '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent', 15 '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
17 ], 16 ],
18 'include_dirs': [ 17 'include_dirs': [
19 '..', 18 '..',
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 ['include', '^common/savable_url_schemes\\.cc$'], 387 ['include', '^common/savable_url_schemes\\.cc$'],
389 ['include', '^common/url_schemes\\.cc$'], 388 ['include', '^common/url_schemes\\.cc$'],
390 ], 389 ],
391 }, { # OS!="ios" 390 }, { # OS!="ios"
392 'dependencies': [ 391 'dependencies': [
393 '../cc/cc.gyp:cc', 392 '../cc/cc.gyp:cc',
394 '../gpu/gpu.gyp:gles2_c_lib', 393 '../gpu/gpu.gyp:gles2_c_lib',
395 '../gpu/gpu.gyp:gles2_implementation', 394 '../gpu/gpu.gyp:gles2_implementation',
396 '../gpu/gpu.gyp:gpu_ipc', 395 '../gpu/gpu.gyp:gpu_ipc',
397 '../ipc/ipc.gyp:ipc', 396 '../ipc/ipc.gyp:ipc',
397 '../media/media.gyp:media',
398 '../media/media.gyp:shared_memory_support', 398 '../media/media.gyp:shared_memory_support',
399 '../third_party/WebKit/public/blink.gyp:blink_minimal', 399 '../third_party/WebKit/public/blink.gyp:blink_minimal',
400 '../ui/gl/gl.gyp:gl', 400 '../ui/gl/gl.gyp:gl',
401 '../webkit/common/webkit_common.gyp:webkit_common', 401 '../webkit/common/webkit_common.gyp:webkit_common',
402 '../webkit/storage_browser.gyp:webkit_storage_browser', 402 '../webkit/storage_browser.gyp:webkit_storage_browser',
403 '../webkit/storage_common.gyp:webkit_storage_common', 403 '../webkit/storage_common.gyp:webkit_storage_common',
404 ], 404 ],
405 }], 405 }],
406 ['OS!="ios" and chrome_multiple_dll!=1', { 406 ['OS!="ios" and chrome_multiple_dll!=1', {
407 'dependencies': [ 407 'dependencies': [
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', 572 '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
573 '<(output)', 573 '<(output)',
574 '<(PRODUCT_DIR)', 574 '<(PRODUCT_DIR)',
575 ], 575 ],
576 'msvs_cygwin_shell': 1, 576 'msvs_cygwin_shell': 1,
577 }, 577 },
578 ] 578 ]
579 }], 579 }],
580 ], 580 ],
581 } 581 }
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