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

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

Issue 1142323003: Remove duplicate application cpp files in mojo/application. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 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/mojo_shell.gyp ('k') | mojo/runner/android/android_handler.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("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 import("//mojo/generate_mojo_shell_assets_list.gni") 6 import("//mojo/generate_mojo_shell_assets_list.gni")
7 import("//third_party/mojo/src/mojo/public/mojo.gni") 7 import("//third_party/mojo/src/mojo/public/mojo.gni")
8 import("//third_party/mojo/src/mojo/public/mojo_application.gni") 8 import("//third_party/mojo/src/mojo/public/mojo_application.gni")
9 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") 9 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
10 import("//testing/test.gni") 10 import("//testing/test.gni")
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 "url_resolver.h", 116 "url_resolver.h",
117 ] 117 ]
118 118
119 deps = [ 119 deps = [
120 ":child_process_bindings", 120 ":child_process_bindings",
121 ":in_process_native_runner", 121 ":in_process_native_runner",
122 ":native_application_support", 122 ":native_application_support",
123 "//base", 123 "//base",
124 "//base/third_party/dynamic_annotations", 124 "//base/third_party/dynamic_annotations",
125 "//base:base_static", 125 "//base:base_static",
126 "//mojo/application", 126 "//mojo/application/public/cpp",
127 "//mojo/application/public/interfaces",
128 "//mojo/common",
129 "//mojo/common:tracing_impl", 127 "//mojo/common:tracing_impl",
130 "//mojo/util:filename_util", 128 "//mojo/util:filename_util",
131 "//third_party/mojo/src/mojo/edk/system", 129 "//third_party/mojo/src/mojo/edk/system",
132 "//third_party/mojo/src/mojo/public/cpp/bindings",
133 "//mojo/services/network/public/interfaces", 130 "//mojo/services/network/public/interfaces",
134 "//mojo/shell", 131 "//mojo/shell",
135 "//mojo/services/tracing:bindings", 132 "//mojo/services/tracing:bindings",
136 "//ui/gl", 133 "//ui/gl",
137 "//url", 134 "//url",
138 ] 135 ]
139 136
140 public_deps = [ 137 public_deps = [
141 ":switches", 138 ":switches",
142 ] 139 ]
(...skipping 12 matching lines...) Expand all
155 "android/native_viewport_application_loader.h", 152 "android/native_viewport_application_loader.h",
156 "android/ui_application_loader_android.cc", 153 "android/ui_application_loader_android.cc",
157 "android/ui_application_loader_android.h", 154 "android/ui_application_loader_android.h",
158 ] 155 ]
159 156
160 deps += [ 157 deps += [
161 ":jni_headers", 158 ":jni_headers",
162 ":run_android_application_function", 159 ":run_android_application_function",
163 "//components/gles2", 160 "//components/gles2",
164 "//components/view_manager/native_viewport:lib", 161 "//components/view_manager/native_viewport:lib",
165 "//mojo/application:content_handler", 162 "//mojo/application/public/cpp:content_handler",
166 ] 163 ]
167 } 164 }
168 165
169 # This target includes some files behind #ifdef OS... guards. Since gn is not 166 # This target includes some files behind #ifdef OS... guards. Since gn is not
170 # smart enough to understand preprocess includes, it does complains about 167 # smart enough to understand preprocess includes, it does complains about
171 # these includes when not using the build files for that OS. Suppress checking 168 # these includes when not using the build files for that OS. Suppress checking
172 # so we can enable checking for the rest of the targets in this file. 169 # so we can enable checking for the rest of the targets in this file.
173 # TODO: Might be better to split the files with OS-specific includes out to a 170 # TODO: Might be better to split the files with OS-specific includes out to a
174 # separate source_set so we can leave checking on for the rest of the target. 171 # separate source_set so we can leave checking on for the rest of the target.
175 check_includes = false 172 check_includes = false
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 418
422 testonly = true 419 testonly = true
423 420
424 sources = [ 421 sources = [
425 # TODO(jam): needs http_server service. 422 # TODO(jam): needs http_server service.
426 #"shell_apptest.cc", 423 #"shell_apptest.cc",
427 ] 424 ]
428 425
429 deps = [ 426 deps = [
430 "//base", 427 "//base",
431 "//mojo/application", 428 "//mojo/application/public/cpp:test_support",
432 "//mojo/application:test_support",
433 "//mojo/common:common",
434 "//mojo/runner/test:bindings", 429 "//mojo/runner/test:bindings",
435
436 #"//mojo/services/http_server/public/cpp",
437 #"//mojo/services/http_server/public/interfaces",
438 "//mojo/services/network/public/interfaces", 430 "//mojo/services/network/public/interfaces",
439
440 "//third_party/mojo/src/mojo/public/cpp/bindings:callback", 431 "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
441 "//third_party/mojo/src/mojo/public/cpp/environment",
442 "//third_party/mojo/src/mojo/public/cpp/system:system",
443 ] 432 ]
444
445 #data_deps = [ "//services/http_server:http_server($default_toolchain)" ]
446 } 433 }
OLDNEW
« no previous file with comments | « mojo/mojo_shell.gyp ('k') | mojo/runner/android/android_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698