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

Side by Side Diff: mojo/mojo_base.gyp

Issue 1101303002: Update mojo sdk to rev e7270700d671fa8e458b4d8c9e47f7bcfb65da0b (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Actualy provide a default TaskTracker impl Created 5 years, 8 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
« no previous file with comments | « mojo/environment/environment.cc ('k') | third_party/mojo/mojo_public.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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 'type': 'static_library', 113 'type': 'static_library',
114 'dependencies': [ 114 'dependencies': [
115 'mojo_environment_chromium_impl', 115 'mojo_environment_chromium_impl',
116 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 116 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
117 ], 117 ],
118 'sources': [ 118 'sources': [
119 'environment/environment.cc', 119 'environment/environment.cc',
120 # TODO(vtl): This is kind of ugly. (See TODO in logging.h.) 120 # TODO(vtl): This is kind of ugly. (See TODO in logging.h.)
121 "../third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h", 121 "../third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h",
122 "../third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc ", 122 "../third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc ",
123 "../third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc",
124 "../third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tra cking.cc",
125 "../third_party/mojo/src/mojo/public/cpp/environment/lib/scoped_task_tra cking.cc",
123 "../third_party/mojo/src/mojo/public/cpp/environment/logging.h", 126 "../third_party/mojo/src/mojo/public/cpp/environment/logging.h",
124 "../third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc", 127 "../third_party/mojo/src/mojo/public/cpp/environment/task_tracker.h",
125 ], 128 ],
126 'include_dirs': [ 129 'include_dirs': [
127 '..', 130 '..',
128 '../third_party/mojo/src', 131 '../third_party/mojo/src',
129 ], 132 ],
130 'direct_dependent_settings': { 133 'direct_dependent_settings': {
131 'include_dirs': [ 134 'include_dirs': [
132 '../third_party/mojo/src', 135 '../third_party/mojo/src',
133 ], 136 ],
134 }, 137 },
(...skipping 14 matching lines...) Expand all
149 'mojo_common_lib', 152 'mojo_common_lib',
150 '<(mojo_system_for_component)', 153 '<(mojo_system_for_component)',
151 ], 154 ],
152 'sources': [ 155 'sources': [
153 'environment/default_async_waiter_impl.cc', 156 'environment/default_async_waiter_impl.cc',
154 'environment/default_async_waiter_impl.h', 157 'environment/default_async_waiter_impl.h',
155 'environment/default_logger_impl.cc', 158 'environment/default_logger_impl.cc',
156 'environment/default_logger_impl.h', 159 'environment/default_logger_impl.h',
157 'environment/default_run_loop_impl.cc', 160 'environment/default_run_loop_impl.cc',
158 'environment/default_run_loop_impl.h', 161 'environment/default_run_loop_impl.h',
162 'environment/default_task_tracker_impl.cc',
163 'environment/default_task_tracker_impl.h',
159 ], 164 ],
160 'include_dirs': [ 165 'include_dirs': [
161 '..', 166 '..',
162 '../third_party/mojo/src', 167 '../third_party/mojo/src',
163 ], 168 ],
164 'direct_dependent_settings': { 169 'direct_dependent_settings': {
165 'include_dirs': [ 170 'include_dirs': [
166 '../third_party/mojo/src', 171 '../third_party/mojo/src',
167 ], 172 ],
168 }, 173 },
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 ], 244 ],
240 'variables': { 245 'variables': {
241 'java_in_dir': '<(DEPTH)/mojo/android/system', 246 'java_in_dir': '<(DEPTH)/mojo/android/system',
242 }, 247 },
243 'includes': [ '../build/java.gypi' ], 248 'includes': [ '../build/java.gypi' ],
244 }, 249 },
245 ] 250 ]
246 }] 251 }]
247 ] 252 ]
248 } 253 }
OLDNEW
« no previous file with comments | « mojo/environment/environment.cc ('k') | third_party/mojo/mojo_public.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698