| OLD | NEW |
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 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("//services/shell/public/cpp/service.gni") |
| 6 import("//mojo/public/mojo_application_manifest.gni") | 6 import("//services/shell/public/service_manifest.gni") |
| 7 import("//mojo/public/tools/bindings/mojom.gni") | 7 import("//mojo/public/tools/bindings/mojom.gni") |
| 8 import("//testing/test.gni") | 8 import("//testing/test.gni") |
| 9 | 9 |
| 10 source_set("connect") { | 10 source_set("connect") { |
| 11 testonly = true | 11 testonly = true |
| 12 sources = [ | 12 sources = [ |
| 13 "connect_unittest.cc", | 13 "connect_unittest.cc", |
| 14 ] | 14 ] |
| 15 deps = [ | 15 deps = [ |
| 16 ":interfaces", | 16 ":interfaces", |
| (...skipping 19 matching lines...) Expand all Loading... |
| 36 sources = [ | 36 sources = [ |
| 37 "connect_test.mojom", | 37 "connect_test.mojom", |
| 38 ] | 38 ] |
| 39 deps = [ | 39 deps = [ |
| 40 "//services/shell/public/interfaces", | 40 "//services/shell/public/interfaces", |
| 41 ] | 41 ] |
| 42 | 42 |
| 43 use_new_wrapper_types = false | 43 use_new_wrapper_types = false |
| 44 } | 44 } |
| 45 | 45 |
| 46 mojo_application_manifest("manifest") { | 46 service_manifest("manifest") { |
| 47 application_name = "connect_unittests" | 47 name = "connect_unittests" |
| 48 source = "connect_unittests_manifest.json" | 48 source = "connect_unittests_manifest.json" |
| 49 } | 49 } |
| 50 | 50 |
| 51 mojo_application_manifest("connect_test_a_manifest") { | 51 service_manifest("connect_test_a_manifest") { |
| 52 application_name = "connect_test_a" | 52 name = "connect_test_a" |
| 53 source = "connect_test_app_a_manifest.json" | 53 source = "connect_test_app_a_manifest.json" |
| 54 } | 54 } |
| 55 | 55 |
| 56 mojo_application_manifest("connect_test_b_manifest") { | 56 service_manifest("connect_test_b_manifest") { |
| 57 application_name = "connect_test_b" | 57 name = "connect_test_b" |
| 58 source = "connect_test_app_b_manifest.json" | 58 source = "connect_test_app_b_manifest.json" |
| 59 } | 59 } |
| 60 | 60 |
| 61 mojo_native_application("connect_test_package") { | 61 service("connect_test_package") { |
| 62 testonly = true | 62 testonly = true |
| 63 sources = [ | 63 sources = [ |
| 64 "connect_test_package.cc", | 64 "connect_test_package.cc", |
| 65 ] | 65 ] |
| 66 deps = [ | 66 deps = [ |
| 67 ":interfaces", | 67 ":interfaces", |
| 68 "//base", | 68 "//base", |
| 69 "//mojo/common:common_base", | 69 "//mojo/common:common_base", |
| 70 "//services/shell/public/cpp:sources", | 70 "//services/shell/public/cpp:sources", |
| 71 "//services/shell/public/interfaces", | 71 "//services/shell/public/interfaces", |
| 72 ] | 72 ] |
| 73 data_deps = [ | 73 data_deps = [ |
| 74 ":connect_test_package_manifest", | 74 ":connect_test_package_manifest", |
| 75 ] | 75 ] |
| 76 } | 76 } |
| 77 | 77 |
| 78 mojo_application_manifest("connect_test_package_manifest") { | 78 service_manifest("connect_test_package_manifest") { |
| 79 application_name = "connect_test_package" | 79 name = "connect_test_package" |
| 80 source = "connect_test_package_manifest.json" | 80 source = "connect_test_package_manifest.json" |
| 81 deps = [ | 81 deps = [ |
| 82 ":connect_test_a_manifest", | 82 ":connect_test_a_manifest", |
| 83 ":connect_test_b_manifest", | 83 ":connect_test_b_manifest", |
| 84 ] | 84 ] |
| 85 packaged_applications = [ | 85 packaged_services = [ |
| 86 "connect_test_a", | 86 "connect_test_a", |
| 87 "connect_test_b", | 87 "connect_test_b", |
| 88 ] | 88 ] |
| 89 } | 89 } |
| 90 | 90 |
| 91 mojo_native_application("connect_test_app") { | 91 service("connect_test_app") { |
| 92 testonly = true | 92 testonly = true |
| 93 sources = [ | 93 sources = [ |
| 94 "connect_test_app.cc", | 94 "connect_test_app.cc", |
| 95 ] | 95 ] |
| 96 deps = [ | 96 deps = [ |
| 97 ":interfaces", | 97 ":interfaces", |
| 98 "//base", | 98 "//base", |
| 99 "//mojo/common:common_base", | 99 "//mojo/common:common_base", |
| 100 "//services/shell/public/cpp:sources", | 100 "//services/shell/public/cpp:sources", |
| 101 "//services/shell/public/interfaces", | 101 "//services/shell/public/interfaces", |
| 102 ] | 102 ] |
| 103 data_deps = [ | 103 data_deps = [ |
| 104 ":connect_test_app_manifest", | 104 ":connect_test_app_manifest", |
| 105 ] | 105 ] |
| 106 } | 106 } |
| 107 | 107 |
| 108 mojo_application_manifest("connect_test_app_manifest") { | 108 service_manifest("connect_test_app_manifest") { |
| 109 application_name = "connect_test_app" | 109 name = "connect_test_app" |
| 110 source = "connect_test_app_manifest.json" | 110 source = "connect_test_app_manifest.json" |
| 111 } | 111 } |
| 112 | 112 |
| 113 mojo_native_application("connect_test_class_app") { | 113 service("connect_test_class_app") { |
| 114 testonly = true | 114 testonly = true |
| 115 sources = [ | 115 sources = [ |
| 116 "connect_test_class_app.cc", | 116 "connect_test_class_app.cc", |
| 117 ] | 117 ] |
| 118 deps = [ | 118 deps = [ |
| 119 ":interfaces", | 119 ":interfaces", |
| 120 "//base", | 120 "//base", |
| 121 "//mojo/common:common_base", | 121 "//mojo/common:common_base", |
| 122 "//services/shell/public/cpp:sources", | 122 "//services/shell/public/cpp:sources", |
| 123 "//services/shell/public/interfaces", | 123 "//services/shell/public/interfaces", |
| 124 ] | 124 ] |
| 125 data_deps = [ | 125 data_deps = [ |
| 126 ":connect_test_class_app_manifest", | 126 ":connect_test_class_app_manifest", |
| 127 ] | 127 ] |
| 128 } | 128 } |
| 129 | 129 |
| 130 mojo_application_manifest("connect_test_class_app_manifest") { | 130 service_manifest("connect_test_class_app_manifest") { |
| 131 application_name = "connect_test_class_app" | 131 name = "connect_test_class_app" |
| 132 source = "connect_test_class_app_manifest.json" | 132 source = "connect_test_class_app_manifest.json" |
| 133 } | 133 } |
| 134 | 134 |
| 135 mojo_native_application("connect_test_singleton_app") { | 135 service("connect_test_singleton_app") { |
| 136 testonly = true | 136 testonly = true |
| 137 sources = [ | 137 sources = [ |
| 138 "connect_test_singleton_app.cc", | 138 "connect_test_singleton_app.cc", |
| 139 ] | 139 ] |
| 140 deps = [ | 140 deps = [ |
| 141 "//base", | 141 "//base", |
| 142 "//mojo/common:common_base", | 142 "//mojo/common:common_base", |
| 143 "//services/shell/public/cpp:sources", | 143 "//services/shell/public/cpp:sources", |
| 144 ] | 144 ] |
| 145 data_deps = [ | 145 data_deps = [ |
| 146 ":connect_test_singleton_app_manifest", | 146 ":connect_test_singleton_app_manifest", |
| 147 ] | 147 ] |
| 148 } | 148 } |
| 149 | 149 |
| 150 mojo_application_manifest("connect_test_singleton_app_manifest") { | 150 service_manifest("connect_test_singleton_app_manifest") { |
| 151 application_name = "connect_test_singleton_app" | 151 name = "connect_test_singleton_app" |
| 152 source = "connect_test_singleton_app_manifest.json" | 152 source = "connect_test_singleton_app_manifest.json" |
| 153 } | 153 } |
| 154 | 154 |
| 155 executable("connect_test_driver") { | 155 executable("connect_test_driver") { |
| 156 testonly = true | 156 testonly = true |
| 157 | 157 |
| 158 sources = [ | 158 sources = [ |
| 159 "connect_test_driver.cc", | 159 "connect_test_driver.cc", |
| 160 ] | 160 ] |
| 161 | 161 |
| 162 deps = [ | 162 deps = [ |
| 163 ":interfaces", | 163 ":interfaces", |
| 164 "//base", | 164 "//base", |
| 165 "//build/win:default_exe_manifest", | 165 "//build/win:default_exe_manifest", |
| 166 "//services/shell/public/cpp", | 166 "//services/shell/public/cpp", |
| 167 "//services/shell/runner/child:test_native_main", | 167 "//services/shell/runner/child:test_native_main", |
| 168 "//services/shell/tests:util", | 168 "//services/shell/tests:util", |
| 169 ] | 169 ] |
| 170 | 170 |
| 171 data_deps = [ | 171 data_deps = [ |
| 172 ":connect_test_driver_manifest", | 172 ":connect_test_driver_manifest", |
| 173 ] | 173 ] |
| 174 } | 174 } |
| 175 | 175 |
| 176 mojo_application_manifest("connect_test_driver_manifest") { | 176 service_manifest("connect_test_driver_manifest") { |
| 177 type = "exe" | 177 type = "exe" |
| 178 application_name = "connect_test_driver" | 178 name = "connect_test_driver" |
| 179 source = "connect_test_driver_manifest.json" | 179 source = "connect_test_driver_manifest.json" |
| 180 } | 180 } |
| 181 | 181 |
| 182 executable("connect_test_exe") { | 182 executable("connect_test_exe") { |
| 183 testonly = true | 183 testonly = true |
| 184 | 184 |
| 185 sources = [ | 185 sources = [ |
| 186 "connect_test_exe.cc", | 186 "connect_test_exe.cc", |
| 187 ] | 187 ] |
| 188 | 188 |
| 189 deps = [ | 189 deps = [ |
| 190 ":interfaces", | 190 ":interfaces", |
| 191 "//base", | 191 "//base", |
| 192 "//build/win:default_exe_manifest", | 192 "//build/win:default_exe_manifest", |
| 193 "//services/shell/public/cpp", | 193 "//services/shell/public/cpp", |
| 194 "//services/shell/runner/child:test_native_main", | 194 "//services/shell/runner/child:test_native_main", |
| 195 ] | 195 ] |
| 196 | 196 |
| 197 data_deps = [ | 197 data_deps = [ |
| 198 ":connect_test_exe_manifest", | 198 ":connect_test_exe_manifest", |
| 199 ] | 199 ] |
| 200 } | 200 } |
| 201 | 201 |
| 202 mojo_application_manifest("connect_test_exe_manifest") { | 202 service_manifest("connect_test_exe_manifest") { |
| 203 type = "exe" | 203 type = "exe" |
| 204 application_name = "connect_test_exe" | 204 name = "connect_test_exe" |
| 205 source = "connect_test_exe_manifest.json" | 205 source = "connect_test_exe_manifest.json" |
| 206 } | 206 } |
| OLD | NEW |