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

Side by Side Diff: mojo/public/mojo_application.gni

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 import("//build/toolchain/toolchain.gni") 5 import("//build/toolchain/toolchain.gni")
6 import("mojo.gni") 6 import("mojo.gni")
7 7
8 # Generate a binary Mojo application in a self-named directory. 8 # Generate a binary Mojo application in a self-named directory.
9 # Application resources are copied to a "resources" directory alongside the app. 9 # Application resources are copied to a "resources" directory alongside the app.
10 # The parameters of this template are those of a shared library. 10 # The parameters of this template are those of a shared library.
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 if (!defined(invoker.avoid_runner_cycle) || !invoker.avoid_runner_cycle) { 77 if (!defined(invoker.avoid_runner_cycle) || !invoker.avoid_runner_cycle) {
78 # Give the user an out; as some mojo services are depended on by the 78 # Give the user an out; as some mojo services are depended on by the
79 # runner. 79 # runner.
80 data_deps += [ "//mojo/runner:mojo_runner" ] 80 data_deps += [ "//mojo/runner:mojo_runner" ]
81 } 81 }
82 if (defined(invoker.data_deps)) { 82 if (defined(invoker.data_deps)) {
83 data_deps += invoker.data_deps 83 data_deps += invoker.data_deps
84 } 84 }
85 85
86 # Copy any necessary prebuilt artifacts. 86 # Copy any necessary prebuilt artifacts.
87 if (mojo_use_prebuilt_mojo_shell) {
88 data_deps +=
89 [ rebase_path("mojo/public/tools:copy_mojo_shell", ".", mojo_root) ]
90 }
91 if (mojo_use_prebuilt_network_service) {
92 data_deps += [ rebase_path("mojo/public/tools:copy_network_service",
93 ".",
94 mojo_root) ]
95 }
96 87
97 deps = rebase_path([ 88 deps = [
98 "mojo/public/gles2:for_shared_library", 89 "//mojo/platform_handle:for_shared_library",
99 "mojo/public/c/system:for_shared_library", 90 "//mojo/public/c/system:for_shared_library",
100 ], 91 "//mojo/public/gles2:for_shared_library",
101 ".", 92 ]
102 mojo_root)
103 deps += [ "//mojo/platform_handle:for_shared_library" ]
104 93
105 deps += mojo_deps 94 deps += mojo_deps
106 if (defined(invoker.public_deps)) { 95 if (defined(invoker.public_deps)) {
107 public_deps = invoker.public_deps 96 public_deps = invoker.public_deps
108 } 97 }
109 if (defined(invoker.all_dependent_configs)) { 98 if (defined(invoker.all_dependent_configs)) {
110 all_dependent_configs = invoker.all_dependent_configs 99 all_dependent_configs = invoker.all_dependent_configs
111 } 100 }
112 if (defined(invoker.public_configs)) { 101 if (defined(invoker.public_configs)) {
113 public_configs = invoker.public_configs 102 public_configs = invoker.public_configs
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 if (defined(invoker.libs)) { 183 if (defined(invoker.libs)) {
195 libs = invoker.libs 184 libs = invoker.libs
196 } 185 }
197 186
198 data_deps = [] 187 data_deps = []
199 if (defined(invoker.data_deps)) { 188 if (defined(invoker.data_deps)) {
200 data_deps = invoker.data_deps 189 data_deps = invoker.data_deps
201 } 190 }
202 191
203 # Copy any necessary prebuilt artifacts. 192 # Copy any necessary prebuilt artifacts.
204 if (mojo_use_prebuilt_mojo_shell) { 193 deps = [
205 data_deps += 194 "//mojo/public/c/system",
206 [ rebase_path("mojo/public/tools:copy_mojo_shell", ".", mojo_root) ] 195 "//mojo/public/platform/nacl:system",
207 } 196 ]
208 if (mojo_use_prebuilt_network_service) {
209 data_deps += [ rebase_path("mojo/public/tools:copy_network_service",
210 ".",
211 mojo_root) ]
212 }
213
214 deps = rebase_path([
215 "mojo/public/c/system",
216 "mojo/public/platform/nacl:system",
217 ],
218 ".",
219 mojo_root)
220 deps += mojo_deps 197 deps += mojo_deps
221 if (defined(invoker.public_deps)) { 198 if (defined(invoker.public_deps)) {
222 public_deps = invoker.public_deps 199 public_deps = invoker.public_deps
223 } 200 }
224 if (defined(invoker.all_dependent_configs)) { 201 if (defined(invoker.all_dependent_configs)) {
225 all_dependent_configs = invoker.all_dependent_configs 202 all_dependent_configs = invoker.all_dependent_configs
226 } 203 }
227 if (defined(invoker.public_configs)) { 204 if (defined(invoker.public_configs)) {
228 public_configs = invoker.public_configs 205 public_configs = invoker.public_configs
229 } 206 }
(...skipping 23 matching lines...) Expand all
253 } 230 }
254 231
255 action(target_name) { 232 action(target_name) {
256 if (defined(invoker.testonly)) { 233 if (defined(invoker.testonly)) {
257 testonly = invoker.testonly 234 testonly = invoker.testonly
258 } 235 }
259 if (defined(invoker.visibility)) { 236 if (defined(invoker.visibility)) {
260 visibility = invoker.visibility 237 visibility = invoker.visibility
261 } 238 }
262 239
263 script = rebase_path("mojo/public/tools/prepend.py", ".", mojo_root) 240 script = "//mojo/public/tools/prepend.py"
264 241
265 input_path = "${root_out_dir}/${nexe_name}" 242 input_path = "${root_out_dir}/${nexe_name}"
266 inputs = [ 243 inputs = [
267 input_path, 244 input_path,
268 ] 245 ]
269 246
270 output_path = "${root_build_dir}/${base_target_name}/${output}" 247 output_path = "${root_build_dir}/${base_target_name}/${output}"
271 outputs = [ 248 outputs = [
272 output_path, 249 output_path,
273 ] 250 ]
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 } 331 }
355 if (defined(invoker.public_deps)) { 332 if (defined(invoker.public_deps)) {
356 public_deps = invoker.public_deps 333 public_deps = invoker.public_deps
357 } 334 }
358 if (defined(invoker.data_deps)) { 335 if (defined(invoker.data_deps)) {
359 data_deps = invoker.data_deps 336 data_deps = invoker.data_deps
360 } 337 }
361 } 338 }
362 339
363 action(target_name) { 340 action(target_name) {
364 script = rebase_path("mojo/public/tools/prepend.py", ".", mojo_root) 341 script = "//mojo/public/tools/prepend.py"
365 342
366 base_target_name = target_name 343 base_target_name = target_name
367 if (defined(invoker.output_name)) { 344 if (defined(invoker.output_name)) {
368 base_target_name = invoker.output_name 345 base_target_name = invoker.output_name
369 } 346 }
370 347
371 input = zip_action_output 348 input = zip_action_output
372 inputs = [ 349 inputs = [
373 input, 350 input,
374 ] 351 ]
(...skipping 12 matching lines...) Expand all
387 ] 364 ]
388 365
389 deps = mojo_deps 366 deps = mojo_deps
390 367
391 public_deps = [ 368 public_deps = [
392 ":$zip_action_name", 369 ":$zip_action_name",
393 ] 370 ]
394 } 371 }
395 } 372 }
396 } 373 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698