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

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

Issue 1423723007: Revert of Enable multiprocess by default on desktop mojo_runner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « mojo/message_pump/handle_watcher.cc ('k') | mojo/runner/desktop/launcher_process.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 group("runner") { 10 group("runner") {
(...skipping 29 matching lines...) Expand all
40 ] 40 ]
41 41
42 if (!is_android) { 42 if (!is_android) {
43 sources += [ 43 sources += [
44 "desktop/launcher_process.cc", 44 "desktop/launcher_process.cc",
45 "desktop/launcher_process.h", 45 "desktop/launcher_process.h",
46 "desktop/main.cc", 46 "desktop/main.cc",
47 "register_local_aliases.cc", 47 "register_local_aliases.cc",
48 "register_local_aliases.h", 48 "register_local_aliases.h",
49 ] 49 ]
50 deps += [ 50 deps += [ "//components/tracing:startup_tracing" ]
51 "//components/tracing:startup_tracing",
52 "//mojo/shell",
53 ]
54 } else { 51 } else {
55 sources += [ 52 sources += [
56 "android/context_init.h", 53 "android/context_init.h",
57 "android/library_loader.cc", 54 "android/library_loader.cc",
58 "android/main.cc", 55 "android/main.cc",
59 "android/main.h", 56 "android/main.h",
60 ] 57 ]
61 58
62 deps += [ 59 deps += [
63 ":jni_headers", 60 ":jni_headers",
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 ] 477 ]
481 478
482 deps = [ 479 deps = [
483 "//base", 480 "//base",
484 "//mojo/application/public/cpp:test_support", 481 "//mojo/application/public/cpp:test_support",
485 "//mojo/runner/test:bindings", 482 "//mojo/runner/test:bindings",
486 "//mojo/services/network/public/interfaces", 483 "//mojo/services/network/public/interfaces",
487 "//third_party/mojo/src/mojo/public/cpp/bindings:callback", 484 "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
488 ] 485 ]
489 } 486 }
OLDNEW
« no previous file with comments | « mojo/message_pump/handle_watcher.cc ('k') | mojo/runner/desktop/launcher_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698