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

Side by Side Diff: content/app/BUILD.gn

Issue 1455423002: Revert of Define MOJO_SHELL_CLIENT uniformly across content (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 | « no previous file | content/browser/BUILD.gn » ('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/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 6
7 content_app_sources = [ 7 content_app_sources = [
8 "android/app_jni_registrar.cc", 8 "android/app_jni_registrar.cc",
9 "android/app_jni_registrar.h", 9 "android/app_jni_registrar.h",
10 "android/child_process_service.cc", 10 "android/child_process_service.cc",
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 content_app_deps += [ 63 content_app_deps += [
64 "//mojo/application/public/interfaces", 64 "//mojo/application/public/interfaces",
65 "//mojo/environment:chromium", 65 "//mojo/environment:chromium",
66 "//third_party/mojo/src/mojo/edk/system", 66 "//third_party/mojo/src/mojo/edk/system",
67 ] 67 ]
68 } 68 }
69 69
70 content_app_extra_configs = [ 70 content_app_extra_configs = [
71 "//build/config/compiler:wexit_time_destructors", 71 "//build/config/compiler:wexit_time_destructors",
72 "//content:content_implementation", 72 "//content:content_implementation",
73 "//content/public/common:mojo_shell_client",
74 "//v8:external_startup_data", 73 "//v8:external_startup_data",
75 ] 74 ]
76 75
77 if (!is_multi_dll_chrome) { 76 if (!is_multi_dll_chrome) {
78 content_app_deps += [ "//content/gpu:gpu_sources" ] 77 content_app_deps += [ "//content/gpu:gpu_sources" ]
79 } 78 }
80 79
81 # This includes the app sources for both the browser and child processes. 80 # This includes the app sources for both the browser and child processes.
82 source_set("both") { 81 source_set("both") {
83 # Only the public target should depend on this. All other targets (even 82 # Only the public target should depend on this. All other targets (even
(...skipping 22 matching lines...) Expand all
106 source_set("child") { 105 source_set("child") {
107 visibility = [ "//content/public/app:child" ] 106 visibility = [ "//content/public/app:child" ]
108 107
109 sources = content_app_sources 108 sources = content_app_sources
110 configs += content_app_extra_configs 109 configs += content_app_extra_configs
111 deps = content_app_deps 110 deps = content_app_deps
112 111
113 defines = [ "CHROME_MULTIPLE_DLL_CHILD" ] 112 defines = [ "CHROME_MULTIPLE_DLL_CHILD" ]
114 } 113 }
115 } 114 }
OLDNEW
« no previous file with comments | « no previous file | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698