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

Side by Side Diff: mojo/runner/BUILD.gn

Issue 1186683008: Revert of Build Mojo apps in subdirectories, like application packages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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/public/mojo_application.gni ('k') | mojo/runner/context.cc » ('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 import("//mojo/generate_mojo_shell_assets_list.gni") 5 import("//mojo/generate_mojo_shell_assets_list.gni")
6 import("//mojo/public/mojo_application.gni") 6 import("//mojo/public/mojo_application.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") 8 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
9 9
10 # We don't support building in the component build since mojo apps are 10 # We don't support building in the component build since mojo apps are
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 clear_dir = true 282 clear_dir = true
283 dest = mojo_runner_assets_dir 283 dest = mojo_runner_assets_dir
284 deps = [ 284 deps = [
285 ":bootstrap", 285 ":bootstrap",
286 ":bootstrap_java", 286 ":bootstrap_java",
287 ":copy_mojo_runner", 287 ":copy_mojo_runner",
288 "//mojo/services/network", 288 "//mojo/services/network",
289 ] 289 ]
290 sources = [ 290 sources = [
291 "$root_out_dir/lib.stripped/libbootstrap.so", 291 "$root_out_dir/lib.stripped/libbootstrap.so",
292 "$root_out_dir/network_service.mojo",
292 "$root_out_dir/obj/mojo/runner/bootstrap_java.dex.jar", 293 "$root_out_dir/obj/mojo/runner/bootstrap_java.dex.jar",
293 ] 294 ]
294
295 # Directories can't be specified as sources so pass manually to the script.
296 args = [ "--files=" +
297 rebase_path("$root_out_dir/network_service", root_build_dir) ]
298 } 295 }
299 296
300 generate_mojo_shell_assets_list("build_mojo_runner_assets") { 297 generate_mojo_shell_assets_list("build_mojo_runner_assets") {
301 deps = [ 298 deps = [
302 ":copy_mojo_runner_assets", 299 ":copy_mojo_runner_assets",
303 ] 300 ]
304 dir = mojo_runner_assets_dir 301 dir = mojo_runner_assets_dir
305 } 302 }
306 303
307 copy("copy_mojo_runner") { 304 copy("copy_mojo_runner") {
308 sources = [ 305 sources = [
309 "$root_out_dir/exe.stripped/mojo_runner", 306 "$root_out_dir/exe.stripped/mojo_runner",
310 ] 307 ]
311 outputs = [ 308 outputs = [
312 "$root_out_dir/lib.stripped/libmojo_runner.so", 309 "$root_out_dir/lib.stripped/libmojo_runner.so",
313 ] 310 ]
314 deps = [ 311 deps = [
315 ":mojo_runner", 312 ":mojo_runner",
316 ] 313 ]
317 } 314 }
318 315
319 copy_ex("copy_mojo_runner_test_assets") { 316 copy_ex("copy_mojo_runner_test_assets") {
320 clear_dir = true 317 clear_dir = true
321 dest = mojo_runner_test_assets_dir 318 dest = mojo_runner_test_assets_dir
319 sources = [
320 "$root_out_dir/test_app.mojo",
321 "$root_out_dir/test_request_tracker_app.mojo",
322 ]
322 deps = [ 323 deps = [
323 "//mojo/services/test_service:test_app", 324 "//mojo/services/test_service:test_app",
324 "//mojo/services/test_service:test_request_tracker_app", 325 "//mojo/services/test_service:test_request_tracker_app",
325 ] 326 ]
326
327 # Directories can't be specified as sources so pass manually to the script.
328 args = [
329 "--files=" + rebase_path("$root_out_dir/test_app", root_build_dir),
330 "--files=" +
331 rebase_path("$root_out_dir/test_request_tracker_app", root_build_dir),
332 ]
333 } 327 }
334 328
335 android_apk("mojo_runner_apk") { 329 android_apk("mojo_runner_apk") {
336 apk_name = "MojoRunner" 330 apk_name = "MojoRunner"
337 331
338 android_manifest = "android/apk/AndroidManifest.xml" 332 android_manifest = "android/apk/AndroidManifest.xml"
339 333
340 native_libs = [ "libmojo_runner.so" ] 334 native_libs = [ "libmojo_runner.so" ]
341 335
342 asset_location = mojo_runner_assets_dir 336 asset_location = mojo_runner_assets_dir
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 ] 438 ]
445 439
446 deps = [ 440 deps = [
447 "//base", 441 "//base",
448 "//mojo/application/public/cpp:test_support", 442 "//mojo/application/public/cpp:test_support",
449 "//mojo/runner/test:bindings", 443 "//mojo/runner/test:bindings",
450 "//mojo/services/network/public/interfaces", 444 "//mojo/services/network/public/interfaces",
451 "//third_party/mojo/src/mojo/public/cpp/bindings:callback", 445 "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
452 ] 446 ]
453 } 447 }
OLDNEW
« no previous file with comments | « mojo/public/mojo_application.gni ('k') | mojo/runner/context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698