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

Side by Side Diff: mash/wm/BUILD.gn

Issue 1783533003: Moves mojo_application_manifest to data_deps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | « mash/task_viewer/BUILD.gn ('k') | media/mojo/services/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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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/public/mojo_application.gni") 6 import("//mojo/public/mojo_application.gni")
7 import("//mojo/public/mojo_application_manifest.gni") 7 import("//mojo/public/mojo_application_manifest.gni")
8 import("//mojo/public/tools/bindings/mojom.gni") 8 import("//mojo/public/tools/bindings/mojom.gni")
9 import("//tools/grit/repack.gni") 9 import("//tools/grit/repack.gni")
10 10
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 96
97 mojo_native_application("wm") { 97 mojo_native_application("wm") {
98 output_name = "desktop_wm" 98 output_name = "desktop_wm"
99 99
100 sources = [ 100 sources = [
101 "main.cc", 101 "main.cc",
102 ] 102 ]
103 103
104 deps = [ 104 deps = [
105 ":lib", 105 ":lib",
106 ":manifest",
107 ":resources", 106 ":resources",
108 "//mojo/shell/public/cpp", 107 "//mojo/shell/public/cpp",
109 ] 108 ]
110 109
111 # TODO(beng): This target relies on //mash/shell, but there is a cycle so we 110 # TODO(beng): This target relies on //mash/shell, but there is a cycle so we
112 # can't state that dependency here. 111 # can't state that dependency here.
113 data_deps = [ 112 data_deps = [
113 ":manifest",
114 "//components/mus", 114 "//components/mus",
115 ] 115 ]
116 116
117 resources = [ "$root_out_dir/mash_wm_resources.pak" ] 117 resources = [ "$root_out_dir/mash_wm_resources.pak" ]
118 } 118 }
119 119
120 mojo_application_manifest("manifest") { 120 mojo_application_manifest("manifest") {
121 application_name = "desktop_wm" 121 application_name = "desktop_wm"
122 source = "manifest.json" 122 source = "manifest.json"
123 } 123 }
(...skipping 19 matching lines...) Expand all
143 mojo_native_application("apptests") { 143 mojo_native_application("apptests") {
144 output_name = "mash_wm_apptests" 144 output_name = "mash_wm_apptests"
145 testonly = true 145 testonly = true
146 146
147 sources = [ 147 sources = [
148 "accelerator_registrar_apptest.cc", 148 "accelerator_registrar_apptest.cc",
149 "window_manager_apptest.cc", 149 "window_manager_apptest.cc",
150 ] 150 ]
151 151
152 deps = [ 152 deps = [
153 ":apptest_manifest",
154 "//base", 153 "//base",
155 "//base/test:test_config", 154 "//base/test:test_config",
156 "//components/mus/public/cpp", 155 "//components/mus/public/cpp",
157 "//components/mus/public/interfaces", 156 "//components/mus/public/interfaces",
158 "//mojo/common:common_base", 157 "//mojo/common:common_base",
159 "//mojo/converters/geometry", 158 "//mojo/converters/geometry",
160 "//mojo/shell/public/cpp:sources", 159 "//mojo/shell/public/cpp:sources",
161 "//mojo/shell/public/cpp:test_support", 160 "//mojo/shell/public/cpp:test_support",
162 "//ui/mojo/geometry:interfaces", 161 "//ui/mojo/geometry:interfaces",
163 "//ui/mojo/geometry:util", 162 "//ui/mojo/geometry:util",
164 ] 163 ]
165 164
166 data_deps = [ 165 data_deps = [
166 ":apptest_manifest",
167 ":wm", 167 ":wm",
168 ] 168 ]
169 169
170 if (use_x11) { 170 if (use_x11) {
171 deps += [ "//tools/xdisplaycheck" ] 171 deps += [ "//tools/xdisplaycheck" ]
172 } 172 }
173 } 173 }
174 174
175 mojo_application_manifest("apptest_manifest") { 175 mojo_application_manifest("apptest_manifest") {
176 application_name = "mash_wm_apptests" 176 application_name = "mash_wm_apptests"
(...skipping 22 matching lines...) Expand all
199 "//mojo/public/cpp/system", 199 "//mojo/public/cpp/system",
200 "//testing/gtest", 200 "//testing/gtest",
201 "//ui/base", 201 "//ui/base",
202 "//ui/events", 202 "//ui/events",
203 "//ui/gfx:test_support", 203 "//ui/gfx:test_support",
204 "//ui/gfx/geometry", 204 "//ui/gfx/geometry",
205 "//ui/mojo/geometry:interfaces", 205 "//ui/mojo/geometry:interfaces",
206 "//ui/mojo/geometry:util", 206 "//ui/mojo/geometry:util",
207 ] 207 ]
208 } 208 }
OLDNEW
« no previous file with comments | « mash/task_viewer/BUILD.gn ('k') | media/mojo/services/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698