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

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

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 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/runner/host/host_unittests.cc ('k') | mojo/shell/application_manager_apptest_driver.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/public/mojo_application.gni") 5 import("//mojo/public/mojo_application.gni")
6 import("//mojo/public/tools/bindings/mojom.gni") 6 import("//mojo/public/tools/bindings/mojom.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 8
9 source_set("shell") { 9 source_set("shell") {
10 output_name = "mojo_shell" 10 output_name = "mojo_shell"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 "//mojo/common", 45 "//mojo/common",
46 "//mojo/public/cpp/bindings", 46 "//mojo/public/cpp/bindings",
47 "//mojo/services/network/public/interfaces", 47 "//mojo/services/network/public/interfaces",
48 "//mojo/services/updater", 48 "//mojo/services/updater",
49 "//mojo/shell/public/interfaces", 49 "//mojo/shell/public/interfaces",
50 "//url", 50 "//url",
51 ] 51 ]
52 deps = [ 52 deps = [
53 "//base/third_party/dynamic_annotations", 53 "//base/third_party/dynamic_annotations",
54 "//crypto:crypto", 54 "//crypto:crypto",
55 "//mojo/edk/system",
55 "//mojo/environment:chromium", 56 "//mojo/environment:chromium",
56 "//mojo/shell/public/cpp:sources", 57 "//mojo/shell/public/cpp:sources",
57 "//mojo/util:filename_util", 58 "//mojo/util:filename_util",
58 "//third_party/mojo/src/mojo/edk/system",
59 "//url", 59 "//url",
60 ] 60 ]
61 } 61 }
62 62
63 source_set("test_support") { 63 source_set("test_support") {
64 testonly = true 64 testonly = true
65 sources = [ 65 sources = [
66 "capability_filter_test.cc", 66 "capability_filter_test.cc",
67 "capability_filter_test.h", 67 "capability_filter_test.h",
68 "test_package_manager.cc", 68 "test_package_manager.cc",
(...skipping 20 matching lines...) Expand all
89 "fetcher/url_resolver_unittest.cc", 89 "fetcher/url_resolver_unittest.cc",
90 "query_util_unittest.cc", 90 "query_util_unittest.cc",
91 ] 91 ]
92 92
93 deps = [ 93 deps = [
94 ":shell", 94 ":shell",
95 ":test_bindings", 95 ":test_bindings",
96 ":test_support", 96 ":test_support",
97 "//base", 97 "//base",
98 "//mojo/edk/system:test_utils", 98 "//mojo/edk/system:test_utils",
99 "//mojo/edk/test:run_all_unittests",
99 "//mojo/public/cpp/system", 100 "//mojo/public/cpp/system",
100 "//mojo/shell/fetcher", 101 "//mojo/shell/fetcher",
101 "//mojo/shell/package_manager", 102 "//mojo/shell/package_manager",
102 "//mojo/shell/public/cpp", 103 "//mojo/shell/public/cpp",
103 "//mojo/util:filename_util", 104 "//mojo/util:filename_util",
104 "//testing/gtest", 105 "//testing/gtest",
105 "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
106 "//url", 106 "//url",
107 ] 107 ]
108 } 108 }
109 109
110 mojom("test_bindings") { 110 mojom("test_bindings") {
111 sources = [ 111 sources = [
112 "application_manager_apptests.mojom", 112 "application_manager_apptests.mojom",
113 "capability_filter_unittest.mojom", 113 "capability_filter_unittest.mojom",
114 "test.mojom", 114 "test.mojom",
115 ] 115 ]
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 "application_manager_apptest_driver.cc", 147 "application_manager_apptest_driver.cc",
148 ] 148 ]
149 149
150 deps = [ 150 deps = [
151 ":test_bindings", 151 ":test_bindings",
152 "//base", 152 "//base",
153 "//base:base_static", 153 "//base:base_static",
154 "//build/config/sanitizers:deps", 154 "//build/config/sanitizers:deps",
155 "//mojo/common:common_base", 155 "//mojo/common:common_base",
156 "//mojo/converters/network", 156 "//mojo/converters/network",
157 "//mojo/edk/system",
157 "//mojo/runner:init", 158 "//mojo/runner:init",
158 "//mojo/runner/child:test_native_main", 159 "//mojo/runner/child:test_native_main",
159 "//mojo/shell/public/cpp", 160 "//mojo/shell/public/cpp",
160 "//mojo/shell/public/interfaces", 161 "//mojo/shell/public/interfaces",
161 "//third_party/mojo/src/mojo/edk/system",
162 ] 162 ]
163 } 163 }
164 164
165 executable("application_manager_apptest_target") { 165 executable("application_manager_apptest_target") {
166 testonly = true 166 testonly = true
167 167
168 sources = [ 168 sources = [
169 "application_manager_apptest_target.cc", 169 "application_manager_apptest_target.cc",
170 ] 170 ]
171 171
172 deps = [ 172 deps = [
173 ":test_bindings", 173 ":test_bindings",
174 "//base", 174 "//base",
175 "//build/config/sanitizers:deps", 175 "//build/config/sanitizers:deps",
176 "//mojo/common:common_base", 176 "//mojo/common:common_base",
177 "//mojo/converters/network", 177 "//mojo/converters/network",
178 "//mojo/runner/child:test_native_main", 178 "//mojo/runner/child:test_native_main",
179 "//mojo/shell/public/cpp", 179 "//mojo/shell/public/cpp",
180 ] 180 ]
181 } 181 }
OLDNEW
« no previous file with comments | « mojo/runner/host/host_unittests.cc ('k') | mojo/shell/application_manager_apptest_driver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698