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

Side by Side Diff: chrome/browser/media/router/media_router.gyp

Issue 1435063002: Eliminate third_party/mojo/src from all targets' include paths (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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 | « no previous file | components/bitmap_uploader/DEPS » ('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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 'includes': [ 6 'includes': [
7 'media_router.gypi', 7 'media_router.gypi',
8 ], 8 ],
9 'targets': [ 9 'targets': [
10 { 10 {
11 # GN version: //chrome/browser/media/router:router 11 # GN version: //chrome/browser/media/router:router
12 'target_name': 'media_router', 12 'target_name': 'media_router',
13 'type': 'static_library', 13 'type': 'static_library',
14 'include_dirs': [ 14 'include_dirs': [
15 '<(DEPTH)', 15 '<(DEPTH)',
16 ], 16 ],
17 'dependencies': [ 17 'dependencies': [
18 '<(DEPTH)/base/base.gyp:base', 18 '<(DEPTH)/base/base.gyp:base',
19 '<(DEPTH)/chrome/common_constants.gyp:common_constants', 19 '<(DEPTH)/chrome/common_constants.gyp:common_constants',
20 '<(DEPTH)/components/components.gyp:keyed_service_content', 20 '<(DEPTH)/components/components.gyp:keyed_service_content',
21 '<(DEPTH)/components/components.gyp:keyed_service_core', 21 '<(DEPTH)/components/components.gyp:keyed_service_core',
22 '<(DEPTH)/skia/skia.gyp:skia', 22 '<(DEPTH)/skia/skia.gyp:skia',
23 '<(DEPTH)/url/url.gyp:url_lib', 23 '<(DEPTH)/url/url.gyp:url_lib',
24 ], 24 ],
25 'sources': [ 25 'sources': [
26 '<@(media_router_sources)', 26 '<@(media_router_sources)',
27 ], 27 ],
28 'conditions': [ 28 'conditions': [
29 [ 'OS!="android" and OS!="ios"', { 29 [ 'OS!="android" and OS!="ios"', {
30 'include_dirs': [
31 '<(DEPTH)/third_party/mojo/src',
32 ],
33 'dependencies': [ 30 'dependencies': [
34 # media_router_type_converters.h needs the generated file. 31 # media_router_type_converters.h needs the generated file.
35 'media_router_mojo_gen', 32 'media_router_mojo_gen',
36 'media_router_mojo', 33 'media_router_mojo',
37 '<(DEPTH)/extensions/extensions.gyp:extensions_browser', 34 '<(DEPTH)/extensions/extensions.gyp:extensions_browser',
38 ], 35 ],
39 'sources': [ 36 'sources': [
40 '<@(media_router_non_android_sources)', 37 '<@(media_router_non_android_sources)',
41 ] 38 ]
42 }], 39 }],
43 ] 40 ]
44 }, 41 },
45 { 42 {
46 # Mojo compiler for the Media Router internal API. 43 # Mojo compiler for the Media Router internal API.
47 'target_name': 'media_router_mojo_gen', 44 'target_name': 'media_router_mojo_gen',
48 'type': 'none', 45 'type': 'none',
49 'sources': [ 46 'sources': [
50 'media_router.mojom', 47 'media_router.mojom',
51 ], 48 ],
52 'includes': [ 49 'includes': [
53 '../../../../third_party/mojo/mojom_bindings_generator.gypi', 50 '../../../../third_party/mojo/mojom_bindings_generator.gypi',
54 ], 51 ],
55 }, 52 },
56 { 53 {
57 'target_name': 'media_router_mojo', 54 'target_name': 'media_router_mojo',
58 'type': 'static_library', 55 'type': 'static_library',
59 'include_dirs': [
60 '<(DEPTH)/third_party/mojo/src',
61 ],
62 'dependencies': [ 56 'dependencies': [
63 'media_router_mojo_gen', 57 'media_router_mojo_gen',
64 ], 58 ],
65 'sources': [ 59 'sources': [
66 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/media/router/media_router.moj om.cc', 60 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/media/router/media_router.moj om.cc',
67 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/media/router/media_router.moj om.h', 61 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/media/router/media_router.moj om.h',
68 ], 62 ],
69 }, 63 },
70 { 64 {
71 # GN version: //chrome/browser/media/router:test_support 65 # GN version: //chrome/browser/media/router:test_support
72 'target_name': 'media_router_test_support', 66 'target_name': 'media_router_test_support',
73 'type': 'static_library', 67 'type': 'static_library',
74 'include_dirs': [ 68 'include_dirs': [
75 '<(DEPTH)', 69 '<(DEPTH)',
76 '<(DEPTH)/third_party/mojo/src',
77 ], 70 ],
78 'dependencies': [ 71 'dependencies': [
79 'media_router', 72 'media_router',
80 'media_router_mojo', 73 'media_router_mojo',
81 'media_router_mojo_gen', 74 'media_router_mojo_gen',
82 '<(DEPTH)/base/base.gyp:base', 75 '<(DEPTH)/base/base.gyp:base',
83 '<(DEPTH)/testing/gmock.gyp:gmock', 76 '<(DEPTH)/testing/gmock.gyp:gmock',
84 ], 77 ],
85 'sources': [ 78 'sources': [
86 '<@(media_router_test_support_sources)', 79 '<@(media_router_test_support_sources)',
87 ], 80 ],
88 }, 81 },
89 ], 82 ],
90 } 83 }
OLDNEW
« no previous file with comments | « no previous file | components/bitmap_uploader/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698