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

Side by Side Diff: mojo/mojo_base.gyp

Issue 703273002: Update mojo sdk to rev 04a510fb37db10642e156957f9b2c11c2f6442ac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix content/child -> mojo/common linking Created 6 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/mojo.gyp ('k') | mojo/public/BUILD.gn » ('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 'mojo_variables.gypi', 10 'mojo_variables.gypi',
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 ], 148 ],
149 'dependencies': [ 149 'dependencies': [
150 'mojo_common_lib', 150 'mojo_common_lib',
151 'mojo_environment_chromium', 151 'mojo_environment_chromium',
152 'public/mojo_public.gyp:mojo_application_base', 152 'public/mojo_public.gyp:mojo_application_base',
153 ], 153 ],
154 'export_dependent_settings': [ 154 'export_dependent_settings': [
155 'public/mojo_public.gyp:mojo_application_base', 155 'public/mojo_public.gyp:mojo_application_base',
156 ], 156 ],
157 }, 157 },
158 {
159 # GN version: //mojo/bindings/js
160 'target_name': 'mojo_js_bindings_lib',
161 'type': 'static_library',
162 'dependencies': [
163 '../base/base.gyp:base',
164 '../gin/gin.gyp:gin',
165 '../v8/tools/gyp/v8.gyp:v8',
166 'mojo_common_lib',
167 ],
168 'export_dependent_settings': [
169 '../base/base.gyp:base',
170 '../gin/gin.gyp:gin',
171 'mojo_common_lib',
172 ],
173 'sources': [
174 # Sources list duplicated in GN build.
175 'bindings/js/core.cc',
176 'bindings/js/core.h',
177 'bindings/js/drain_data.cc',
178 'bindings/js/drain_data.h',
179 'bindings/js/handle.cc',
180 'bindings/js/handle.h',
181 'bindings/js/handle_close_observer.h',
182 'bindings/js/support.cc',
183 'bindings/js/support.h',
184 'bindings/js/waiting_callback.cc',
185 'bindings/js/waiting_callback.h',
186 ],
187 },
188 ], 158 ],
189 'conditions': [ 159 'conditions': [
190 ['OS=="android"', { 160 ['OS=="android"', {
191 'targets': [ 161 'targets': [
192 { 162 {
193 'target_name': 'mojo_jni_headers', 163 'target_name': 'mojo_jni_headers',
194 'type': 'none', 164 'type': 'none',
195 'dependencies': [ 165 'dependencies': [
196 'mojo_java_set_jni_headers', 166 'mojo_java_set_jni_headers',
197 ], 167 ],
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 ], 210 ],
241 'variables': { 211 'variables': {
242 'java_in_dir': '<(DEPTH)/mojo/android/system', 212 'java_in_dir': '<(DEPTH)/mojo/android/system',
243 }, 213 },
244 'includes': [ '../build/java.gypi' ], 214 'includes': [ '../build/java.gypi' ],
245 }, 215 },
246 ] 216 ]
247 }] 217 }]
248 ] 218 ]
249 } 219 }
OLDNEW
« no previous file with comments | « mojo/mojo.gyp ('k') | mojo/public/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698