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

Side by Side Diff: content/content_common.gypi

Issue 468733002: Move webkit_resources.gyp closer to its .grd file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 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/content_child.gypi ('k') | content/content_shell.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 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', 9 '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
10 '../net/net.gyp:net', 10 '../net/net.gyp:net',
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 'variables': { 587 'variables': {
588 'script': '<(DEPTH)/build/util/version.py', 588 'script': '<(DEPTH)/build/util/version.py',
589 'lastchange': '<(DEPTH)/build/util/LASTCHANGE.blink', 589 'lastchange': '<(DEPTH)/build/util/LASTCHANGE.blink',
590 'template': 'webkit_version.h.in', 590 'template': 'webkit_version.h.in',
591 }, 591 },
592 }, 592 },
593 ], 593 ],
594 }], 594 }],
595 ['OS=="mac"', { 595 ['OS=="mac"', {
596 'dependencies': [ 596 'dependencies': [
597 '../webkit/webkit_resources.gyp:webkit_resources', 597 '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
598 ], 598 ],
599 'sources': [ 599 'sources': [
600 'common/gpu/client/gpu_memory_buffer_impl_io_surface.cc', 600 'common/gpu/client/gpu_memory_buffer_impl_io_surface.cc',
601 'common/gpu/client/gpu_memory_buffer_impl_io_surface.h', 601 'common/gpu/client/gpu_memory_buffer_impl_io_surface.h',
602 'common/gpu/media/vt.h', 602 'common/gpu/media/vt.h',
603 'common/gpu/media/vt_video_decode_accelerator.cc', 603 'common/gpu/media/vt_video_decode_accelerator.cc',
604 'common/gpu/media/vt_video_decode_accelerator.h', 604 'common/gpu/media/vt_video_decode_accelerator.h',
605 ], 605 ],
606 'sources!': [ 606 'sources!': [
607 'common/plugin_list_posix.cc', 607 'common/plugin_list_posix.cc',
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 'defines': ['USE_SECCOMP_BPF'], 887 'defines': ['USE_SECCOMP_BPF'],
888 }], 888 }],
889 ['use_ozone==1', { 889 ['use_ozone==1', {
890 'dependencies': [ 890 'dependencies': [
891 '../ui/ozone/ozone.gyp:ozone', 891 '../ui/ozone/ozone.gyp:ozone',
892 '../ui/ozone/gpu/ozone_gpu.gyp:ozone_gpu', 892 '../ui/ozone/gpu/ozone_gpu.gyp:ozone_gpu',
893 ], 893 ],
894 }], 894 }],
895 ], 895 ],
896 } 896 }
OLDNEW
« no previous file with comments | « content/content_child.gypi ('k') | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698