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

Side by Side Diff: mojo/mojo_base.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 | « mojo/gles2/gles2_impl.cc ('k') | mojo/mojo_edk.gyp » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 # Essential components (and their tests) that are needed to build 5 # Essential components (and their tests) that are needed to build
6 # Chrome should be here. Other components that are useful only in 6 # Chrome should be here. Other components that are useful only in
7 # Mojo land like mojo_shell should be in mojo.gyp. 7 # Mojo land like mojo_shell should be in mojo.gyp.
8 { 8 {
9 'includes': [ 9 'includes': [
10 '../third_party/mojo/mojo_variables.gypi', 10 '../third_party/mojo/mojo_variables.gypi',
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 "../third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc ", 160 "../third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc ",
161 "../third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc", 161 "../third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc",
162 "../third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tra cking.cc", 162 "../third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tra cking.cc",
163 "../third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tra cking.cc", 163 "../third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tra cking.cc",
164 "../third_party/mojo/src/mojo/public/cpp/environment/logging.h", 164 "../third_party/mojo/src/mojo/public/cpp/environment/logging.h",
165 "../third_party/mojo/src/mojo/public/cpp/environment/task_tracker.h", 165 "../third_party/mojo/src/mojo/public/cpp/environment/task_tracker.h",
166 'environment/environment.cc', 166 'environment/environment.cc',
167 ], 167 ],
168 'include_dirs': [ 168 'include_dirs': [
169 '..', 169 '..',
170 '../third_party/mojo/src',
171 ], 170 ],
172 'direct_dependent_settings': {
173 'include_dirs': [
174 '../third_party/mojo/src',
175 ],
176 },
177 'export_dependent_settings': [ 171 'export_dependent_settings': [
178 'mojo_environment_chromium_impl', 172 'mojo_environment_chromium_impl',
179 ], 173 ],
180 }, 174 },
181 { 175 {
182 # GN version: //mojo/environment:chromium_impl 176 # GN version: //mojo/environment:chromium_impl
183 'target_name': 'mojo_environment_chromium_impl', 177 'target_name': 'mojo_environment_chromium_impl',
184 'type': '<(component)', 178 'type': '<(component)',
185 'defines': [ 179 'defines': [
186 'MOJO_ENVIRONMENT_IMPL_IMPLEMENTATION', 180 'MOJO_ENVIRONMENT_IMPL_IMPLEMENTATION',
187 ], 181 ],
188 'dependencies': [ 182 'dependencies': [
189 '../base/base.gyp:base', 183 '../base/base.gyp:base',
190 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 184 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
191 'mojo_message_pump_lib', 185 'mojo_message_pump_lib',
192 '<(mojo_system_for_component)', 186 '<(mojo_system_for_component)',
193 ], 187 ],
194 'sources': [ 188 'sources': [
195 'environment/default_async_waiter_impl.cc', 189 'environment/default_async_waiter_impl.cc',
196 'environment/default_async_waiter_impl.h', 190 'environment/default_async_waiter_impl.h',
197 'environment/default_logger_impl.cc', 191 'environment/default_logger_impl.cc',
198 'environment/default_logger_impl.h', 192 'environment/default_logger_impl.h',
199 'environment/default_run_loop_impl.cc', 193 'environment/default_run_loop_impl.cc',
200 'environment/default_run_loop_impl.h', 194 'environment/default_run_loop_impl.h',
201 'environment/default_task_tracker_impl.cc', 195 'environment/default_task_tracker_impl.cc',
202 'environment/default_task_tracker_impl.h', 196 'environment/default_task_tracker_impl.h',
203 ], 197 ],
204 'include_dirs': [ 198 'include_dirs': [
205 '..', 199 '..',
206 '../third_party/mojo/src',
207 ], 200 ],
208 'direct_dependent_settings': {
209 'include_dirs': [
210 '../third_party/mojo/src',
211 ],
212 },
213 }, 201 },
214 { 202 {
215 'target_name': 'mojo_application_bindings_mojom', 203 'target_name': 'mojo_application_bindings_mojom',
216 'type': 'none', 204 'type': 'none',
217 'variables': { 205 'variables': {
218 'mojom_files': [ 206 'mojom_files': [
219 'application/public/interfaces/application.mojom', 207 'application/public/interfaces/application.mojom',
220 'application/public/interfaces/content_handler.mojom', 208 'application/public/interfaces/content_handler.mojom',
221 'application/public/interfaces/service_provider.mojom', 209 'application/public/interfaces/service_provider.mojom',
222 'application/public/interfaces/shell.mojom', 210 'application/public/interfaces/shell.mojom',
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 '../build/isolate.gypi', 363 '../build/isolate.gypi',
376 ], 364 ],
377 'sources': [ 365 'sources': [
378 'mojo_common_unittests.isolate', 366 'mojo_common_unittests.isolate',
379 ], 367 ],
380 }, 368 },
381 ], 369 ],
382 }], 370 }],
383 ] 371 ]
384 } 372 }
OLDNEW
« no previous file with comments | « mojo/gles2/gles2_impl.cc ('k') | mojo/mojo_edk.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698