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

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

Issue 1440053002: Remove duplication between Mandoline and mojo_runner main functions. (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 | « mandoline/app/desktop/main.cc ('k') | mojo/runner/desktop/launcher_process.h » ('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 26 matching lines...) Expand all
37 "//build/config/sanitizers:deps", 37 "//build/config/sanitizers:deps",
38 "//mojo/common", 38 "//mojo/common",
39 "//mojo/environment:chromium", 39 "//mojo/environment:chromium",
40 "//mojo/message_pump", 40 "//mojo/message_pump",
41 "//mojo/runner/host:lib", 41 "//mojo/runner/host:lib",
42 "//mojo/runner/host:switches", 42 "//mojo/runner/host:switches",
43 ] 43 ]
44 44
45 if (!is_android) { 45 if (!is_android) {
46 sources += [ 46 sources += [
47 "desktop/launcher_process.cc",
48 "desktop/launcher_process.h",
49 "desktop/main.cc", 47 "desktop/main.cc",
50 "register_local_aliases.cc", 48 "register_local_aliases.cc",
51 "register_local_aliases.h", 49 "register_local_aliases.h",
52 ] 50 ]
53 deps += [ 51 deps += [
54 "//components/tracing:startup_tracing", 52 "//components/tracing:startup_tracing",
55 "//mojo/shell", 53 "//mojo/shell",
56 ] 54 ]
57 } else { 55 } else {
58 sources += [ 56 sources += [
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 "android/ui_application_loader_android.cc", 165 "android/ui_application_loader_android.cc",
168 "android/ui_application_loader_android.h", 166 "android/ui_application_loader_android.h",
169 ] 167 ]
170 168
171 deps += [ 169 deps += [
172 ":jni_headers", 170 ":jni_headers",
173 ":run_android_application_function", 171 ":run_android_application_function",
174 "//components/mus/gles2", 172 "//components/mus/gles2",
175 "//mojo/application/public/cpp:content_handler", 173 "//mojo/application/public/cpp:content_handler",
176 ] 174 ]
175 } else {
176 sources += [
177 "desktop/launcher_process.cc",
178 "desktop/launcher_process.h",
179 "desktop/main_helper.cc",
180 "desktop/main_helper.h",
181 ]
177 } 182 }
178 183
179 # This target includes some files behind #ifdef OS... guards. Since gn is not 184 # This target includes some files behind #ifdef OS... guards. Since gn is not
180 # smart enough to understand preprocess includes, it does complains about 185 # smart enough to understand preprocess includes, it does complains about
181 # these includes when not using the build files for that OS. Suppress checking 186 # these includes when not using the build files for that OS. Suppress checking
182 # so we can enable checking for the rest of the targets in this file. 187 # so we can enable checking for the rest of the targets in this file.
183 # TODO: Might be better to split the files with OS-specific includes out to a 188 # TODO: Might be better to split the files with OS-specific includes out to a
184 # separate source_set so we can leave checking on for the rest of the target. 189 # separate source_set so we can leave checking on for the rest of the target.
185 check_includes = false 190 check_includes = false
186 } 191 }
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 } 361 }
357 362
358 generate_mojo_shell_assets_list("build_mojo_runner_test_assets") { 363 generate_mojo_shell_assets_list("build_mojo_runner_test_assets") {
359 testonly = true 364 testonly = true
360 deps = [ 365 deps = [
361 ":copy_mojo_runner_test_assets", 366 ":copy_mojo_runner_test_assets",
362 ] 367 ]
363 dir = mojo_runner_test_assets_dir 368 dir = mojo_runner_test_assets_dir
364 } 369 }
365 } 370 }
OLDNEW
« no previous file with comments | « mandoline/app/desktop/main.cc ('k') | mojo/runner/desktop/launcher_process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698