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

Side by Side Diff: content/content_browser.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_static', 7 '../base/base.gyp:base_static',
8 '../crypto/crypto.gyp:crypto', 8 '../crypto/crypto.gyp:crypto',
9 '../google_apis/google_apis.gyp:google_apis', 9 '../google_apis/google_apis.gyp:google_apis',
10 '../net/net.gyp:net', 10 '../net/net.gyp:net',
11 '../skia/skia.gyp:skia', 11 '../skia/skia.gyp:skia',
12 '../sql/sql.gyp:sql', 12 '../sql/sql.gyp:sql',
13 '../third_party/re2/re2.gyp:re2', 13 '../third_party/re2/re2.gyp:re2',
14 '../third_party/zlib/google/zip.gyp:zip', 14 '../third_party/zlib/google/zip.gyp:zip',
15 '../third_party/zlib/zlib.gyp:zlib', 15 '../third_party/zlib/zlib.gyp:zlib',
16 '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
16 '../ui/accessibility/accessibility.gyp:accessibility', 17 '../ui/accessibility/accessibility.gyp:accessibility',
17 '../ui/accessibility/accessibility.gyp:ax_gen', 18 '../ui/accessibility/accessibility.gyp:ax_gen',
18 '../ui/base/ui_base.gyp:ui_base', 19 '../ui/base/ui_base.gyp:ui_base',
19 '../ui/events/events.gyp:events_base', 20 '../ui/events/events.gyp:events_base',
20 '../ui/events/events.gyp:gesture_detection', 21 '../ui/events/events.gyp:gesture_detection',
21 '../ui/gfx/gfx.gyp:gfx', 22 '../ui/gfx/gfx.gyp:gfx',
22 '../ui/gfx/gfx.gyp:gfx_geometry', 23 '../ui/gfx/gfx.gyp:gfx_geometry',
23 '../ui/resources/ui_resources.gyp:ui_resources', 24 '../ui/resources/ui_resources.gyp:ui_resources',
24 '../ui/snapshot/snapshot.gyp:snapshot', 25 '../ui/snapshot/snapshot.gyp:snapshot',
25 'browser/speech/proto/speech_proto.gyp:speech_proto', 26 'browser/speech/proto/speech_proto.gyp:speech_proto',
26 ], 27 ],
27 'export_dependent_settings': [ 28 'export_dependent_settings': [
28 '../ui/accessibility/accessibility.gyp:ax_gen', 29 '../ui/accessibility/accessibility.gyp:ax_gen',
30 # The public content API headers directly include Blink API headers, so we
31 # have to export the blink header settings so that relative paths in these
32 # headers resolve correctly.
33 '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
29 ], 34 ],
30 'include_dirs': [ 35 'include_dirs': [
31 '..', 36 '..',
32 '<(INTERMEDIATE_DIR)', 37 '<(INTERMEDIATE_DIR)',
33 ], 38 ],
34 'sources': [ 39 'sources': [
35 'port/browser/event_with_latency_info.h', 40 'port/browser/event_with_latency_info.h',
36 'port/browser/location_provider.h', 41 'port/browser/location_provider.h',
37 'port/browser/render_view_host_delegate_view.h', 42 'port/browser/render_view_host_delegate_view.h',
38 'port/browser/render_widget_host_view_port.h', 43 'port/browser/render_widget_host_view_port.h',
(...skipping 1664 matching lines...) Expand 10 before | Expand all | Expand 10 after
1703 '../build/linux/system.gyp:dbus', 1708 '../build/linux/system.gyp:dbus',
1704 '../dbus/dbus.gyp:dbus', 1709 '../dbus/dbus.gyp:dbus',
1705 ], 1710 ],
1706 }, { # OS != "linux" or use_dbus==0 1711 }, { # OS != "linux" or use_dbus==0
1707 'sources!': [ 1712 'sources!': [
1708 'browser/geolocation/wifi_data_provider_linux.cc', 1713 'browser/geolocation/wifi_data_provider_linux.cc',
1709 ], 1714 ],
1710 }], 1715 }],
1711 ], 1716 ],
1712 } 1717 }
OLDNEW
« components/nacl.gyp ('K') | « content/content.gyp ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698