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

Side by Side Diff: content/content_common.gypi

Issue 381683003: Fix enable_webrtc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove content_tests when enable_webrtc = 1 Created 6 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
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',
11 '../skia/skia.gyp:skia', 11 '../skia/skia.gyp:skia',
12 '../third_party/WebKit/public/blink_headers.gyp:blink_headers', 12 '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
13 '../third_party/icu/icu.gyp:icuuc', 13 '../third_party/icu/icu.gyp:icuuc',
14 '../third_party/libjingle/libjingle.gyp:libjingle',
15 '../ui/accessibility/accessibility.gyp:accessibility', 14 '../ui/accessibility/accessibility.gyp:accessibility',
16 '../ui/base/ui_base.gyp:ui_base', 15 '../ui/base/ui_base.gyp:ui_base',
17 '../ui/events/ipc/events_ipc.gyp:events_ipc', 16 '../ui/events/ipc/events_ipc.gyp:events_ipc',
18 '../ui/gfx/gfx.gyp:gfx', 17 '../ui/gfx/gfx.gyp:gfx',
19 '../ui/gfx/gfx.gyp:gfx_geometry', 18 '../ui/gfx/gfx.gyp:gfx_geometry',
20 '../ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc', 19 '../ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc',
21 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', 20 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
22 '../url/url.gyp:url_lib', 21 '../url/url.gyp:url_lib',
23 ], 22 ],
24 'include_dirs': [ 23 'include_dirs': [
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 }], 711 }],
713 ['OS=="android" and enable_webrtc==1', { 712 ['OS=="android" and enable_webrtc==1', {
714 'dependencies': [ 713 'dependencies': [
715 '../third_party/libyuv/libyuv.gyp:libyuv', 714 '../third_party/libyuv/libyuv.gyp:libyuv',
716 ], 715 ],
717 'sources': [ 716 'sources': [
718 'common/gpu/media/android_video_encode_accelerator.cc', 717 'common/gpu/media/android_video_encode_accelerator.cc',
719 'common/gpu/media/android_video_encode_accelerator.h', 718 'common/gpu/media/android_video_encode_accelerator.h',
720 ], 719 ],
721 }], 720 }],
721 ['enable_webrtc==1', {
722 'dependencies': [
723 '../third_party/libjingle/libjingle.gyp:libjingle',
724 ],
725 }],
722 ['target_arch=="arm" and chromeos == 1 and use_x11 == 1', { 726 ['target_arch=="arm" and chromeos == 1 and use_x11 == 1', {
723 'dependencies': [ 727 'dependencies': [
724 '../media/media.gyp:media', 728 '../media/media.gyp:media',
725 ], 729 ],
726 'sources': [ 730 'sources': [
727 'common/gpu/media/exynos_v4l2_video_device.cc', 731 'common/gpu/media/exynos_v4l2_video_device.cc',
728 'common/gpu/media/exynos_v4l2_video_device.h', 732 'common/gpu/media/exynos_v4l2_video_device.h',
729 'common/gpu/media/tegra_v4l2_video_device.cc', 733 'common/gpu/media/tegra_v4l2_video_device.cc',
730 'common/gpu/media/tegra_v4l2_video_device.h', 734 'common/gpu/media/tegra_v4l2_video_device.h',
731 'common/gpu/media/v4l2_image_processor.cc', 735 'common/gpu/media/v4l2_image_processor.cc',
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 }, { 882 }, {
879 'defines': ['USE_SECCOMP_BPF'], 883 'defines': ['USE_SECCOMP_BPF'],
880 }], 884 }],
881 ['use_ozone==1', { 885 ['use_ozone==1', {
882 'dependencies': [ 886 'dependencies': [
883 '../ui/ozone/ozone.gyp:ozone', 887 '../ui/ozone/ozone.gyp:ozone',
884 ], 888 ],
885 }], 889 }],
886 ], 890 ],
887 } 891 }
OLDNEW
« no previous file with comments | « content/common/content_message_generator.h ('k') | content/shell/renderer/test_runner/web_frame_test_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698