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

Side by Side Diff: mojo/mojo_base.gyp

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (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
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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 { 149 {
150 # GN version: //mojo/environment:chromium 150 # GN version: //mojo/environment:chromium
151 'target_name': 'mojo_environment_chromium', 151 'target_name': 'mojo_environment_chromium',
152 'type': 'static_library', 152 'type': 'static_library',
153 'dependencies': [ 153 'dependencies': [
154 'mojo_environment_chromium_impl', 154 'mojo_environment_chromium_impl',
155 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 155 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
156 ], 156 ],
157 'sources': [ 157 'sources': [
158 # TODO(vtl): This is kind of ugly. (See TODO in logging.h.) 158 # TODO(vtl): This is kind of ugly. (See TODO in logging.h.)
159 "../third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h", 159 "../mojo/public/cpp/environment/async_waiter.h",
160 "../third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc ", 160 "../mojo/public/cpp/environment/lib/async_waiter.cc",
161 "../third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc", 161 "../mojo/public/cpp/environment/lib/logging.cc",
162 "../third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tra cking.cc", 162 "../mojo/public/cpp/environment/lib/scoped_task_tracking.cc",
163 "../third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tra cking.cc", 163 "../mojo/public/cpp/environment/lib/scoped_task_tracking.cc",
164 "../third_party/mojo/src/mojo/public/cpp/environment/logging.h", 164 "../mojo/public/cpp/environment/logging.h",
165 "../third_party/mojo/src/mojo/public/cpp/environment/task_tracker.h", 165 "../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 ], 170 ],
171 'export_dependent_settings': [ 171 'export_dependent_settings': [
172 'mojo_environment_chromium_impl', 172 'mojo_environment_chromium_impl',
173 ], 173 ],
174 }, 174 },
175 { 175 {
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 '../build/isolate.gypi', 363 '../build/isolate.gypi',
364 ], 364 ],
365 'sources': [ 365 'sources': [
366 'mojo_common_unittests.isolate', 366 'mojo_common_unittests.isolate',
367 ], 367 ],
368 }, 368 },
369 ], 369 ],
370 }], 370 }],
371 ] 371 ]
372 } 372 }
OLDNEW
« no previous file with comments | « mojo/message_pump/message_pump_mojo_unittest.cc ('k') | mojo/mojo_public_gles2_for_loadable_module.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698