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

Side by Side Diff: content/content_common.gypi

Issue 189713002: Declare dependency on blink_headers in targets that use blink headers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge of export_dependent_settings block in content_browser.gypi Created 6 years, 9 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
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',
11 '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
11 '../third_party/icu/icu.gyp:icuuc', 12 '../third_party/icu/icu.gyp:icuuc',
12 '../third_party/libjingle/libjingle.gyp:libjingle', 13 '../third_party/libjingle/libjingle.gyp:libjingle',
13 '../ui/accessibility/accessibility.gyp:accessibility', 14 '../ui/accessibility/accessibility.gyp:accessibility',
14 '../ui/base/ui_base.gyp:ui_base', 15 '../ui/base/ui_base.gyp:ui_base',
15 '../ui/gfx/gfx.gyp:gfx', 16 '../ui/gfx/gfx.gyp:gfx',
16 '../ui/gfx/gfx.gyp:gfx_geometry', 17 '../ui/gfx/gfx.gyp:gfx_geometry',
17 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', 18 '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
18 '../url/url.gyp:url_lib', 19 '../url/url.gyp:url_lib',
19 ], 20 ],
20 'include_dirs': [ 21 'include_dirs': [
21 '..', 22 '..',
22 ], 23 ],
23 'export_dependent_settings': [ 24 'export_dependent_settings': [
24 '../base/base.gyp:base', 25 '../base/base.gyp:base',
26 # The public content API headers directly include Blink API headers, so we
27 # have to export the blink header settings so that relative paths in these
28 # headers resolve correctly.
29 '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
25 ], 30 ],
26 'sources': [ 31 'sources': [
27 'public/common/assert_matching_enums.cc', 32 'public/common/assert_matching_enums.cc',
28 'public/common/bindings_policy.h', 33 'public/common/bindings_policy.h',
29 'public/common/child_process_host.h', 34 'public/common/child_process_host.h',
30 'public/common/child_process_host_delegate.cc', 35 'public/common/child_process_host_delegate.cc',
31 'public/common/child_process_host_delegate.h', 36 'public/common/child_process_host_delegate.h',
32 'public/common/child_process_sandbox_support_linux.h', 37 'public/common/child_process_sandbox_support_linux.h',
33 'public/common/color_suggestion.cc', 38 'public/common/color_suggestion.cc',
34 'public/common/color_suggestion.h', 39 'public/common/color_suggestion.h',
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 'common/sandbox_linux/bpf_renderer_policy_linux.cc', 710 'common/sandbox_linux/bpf_renderer_policy_linux.cc',
706 'common/sandbox_linux/bpf_renderer_policy_linux.h', 711 'common/sandbox_linux/bpf_renderer_policy_linux.h',
707 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', 712 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
708 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h', 713 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h',
709 ], 714 ],
710 }, { 715 }, {
711 'defines': ['USE_SECCOMP_BPF'], 716 'defines': ['USE_SECCOMP_BPF'],
712 }], 717 }],
713 ], 718 ],
714 } 719 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698