| OLD | NEW |
| 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("//media/media_options.gni") | 5 import("//media/media_options.gni") |
| 6 import("//mojo/public/mojo_application.gni") | 6 import("//services/shell/public/cpp/service.gni") |
| 7 import("//mojo/public/mojo_application_manifest.gni") | 7 import("//services/shell/public/service_manifest.gni") |
| 8 import("//testing/test.gni") | 8 import("//testing/test.gni") |
| 9 | 9 |
| 10 config("mojo_media_config") { | 10 config("mojo_media_config") { |
| 11 if (!enable_mojo_media) { | 11 if (!enable_mojo_media) { |
| 12 assert(mojo_media_services == [], "Mojo media is not enabled") | 12 assert(mojo_media_services == [], "Mojo media is not enabled") |
| 13 assert(mojo_media_host == "none", "Mojo media is not enabled") | 13 assert(mojo_media_host == "none", "Mojo media is not enabled") |
| 14 } else { | 14 } else { |
| 15 defines = [ "ENABLE_MOJO_MEDIA" ] | 15 defines = [ "ENABLE_MOJO_MEDIA" ] |
| 16 | 16 |
| 17 assert(mojo_media_services != [], "No mojo media service specified") | 17 assert(mojo_media_services != [], "No mojo media service specified") |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 "android_mojo_media_client.h", | 119 "android_mojo_media_client.h", |
| 120 ] | 120 ] |
| 121 } else { | 121 } else { |
| 122 sources += [ | 122 sources += [ |
| 123 "default_mojo_media_client.cc", | 123 "default_mojo_media_client.cc", |
| 124 "default_mojo_media_client.h", | 124 "default_mojo_media_client.h", |
| 125 ] | 125 ] |
| 126 } | 126 } |
| 127 } | 127 } |
| 128 | 128 |
| 129 mojo_native_application("media") { | 129 service("media") { |
| 130 testonly = true | 130 testonly = true |
| 131 | 131 |
| 132 sources = [ | 132 sources = [ |
| 133 "main.cc", | 133 "main.cc", |
| 134 "test_mojo_media_client.cc", | 134 "test_mojo_media_client.cc", |
| 135 "test_mojo_media_client.h", | 135 "test_mojo_media_client.h", |
| 136 ] | 136 ] |
| 137 | 137 |
| 138 public_deps = [ | 138 public_deps = [ |
| 139 ":services", | 139 ":services", |
| (...skipping 25 matching lines...) Expand all Loading... |
| 165 "//testing/gmock", | 165 "//testing/gmock", |
| 166 "//testing/gtest", | 166 "//testing/gtest", |
| 167 ] | 167 ] |
| 168 | 168 |
| 169 data_deps = [ | 169 data_deps = [ |
| 170 "//media/mojo/services:test_manifest", | 170 "//media/mojo/services:test_manifest", |
| 171 "//media/mojo/services:media", | 171 "//media/mojo/services:media", |
| 172 ] | 172 ] |
| 173 } | 173 } |
| 174 | 174 |
| 175 mojo_application_manifest("media_manifest") { | 175 service_manifest("media_manifest") { |
| 176 application_name = "media" | 176 name = "media" |
| 177 source = "media_manifest.json" | 177 source = "media_manifest.json" |
| 178 } | 178 } |
| 179 | 179 |
| 180 mojo_application_manifest("test_manifest") { | 180 service_manifest("test_manifest") { |
| 181 application_name = "media_mojo_shell_unittests" | 181 name = "media_mojo_shell_unittests" |
| 182 type = "exe" | 182 type = "exe" |
| 183 source = "test_manifest.json" | 183 source = "test_manifest.json" |
| 184 } | 184 } |
| 185 | 185 |
| 186 test("media_pipeline_integration_unittests") { | 186 test("media_pipeline_integration_unittests") { |
| 187 testonly = true | 187 testonly = true |
| 188 | 188 |
| 189 deps = [ | 189 deps = [ |
| 190 "//media/test:mojo_pipeline_integration_tests", | 190 "//media/test:mojo_pipeline_integration_tests", |
| 191 "//services/shell/public/cpp/test:run_all_shelltests", | 191 "//services/shell/public/cpp/test:run_all_shelltests", |
| 192 ] | 192 ] |
| 193 | 193 |
| 194 data_deps = [ | 194 data_deps = [ |
| 195 ":media", | 195 ":media", |
| 196 ":pipeline_test_manifest", | 196 ":pipeline_test_manifest", |
| 197 ] | 197 ] |
| 198 } | 198 } |
| 199 | 199 |
| 200 mojo_application_manifest("pipeline_test_manifest") { | 200 service_manifest("pipeline_test_manifest") { |
| 201 application_name = "media_pipeline_integration_unittests" | 201 name = "media_pipeline_integration_unittests" |
| 202 type = "exe" | 202 type = "exe" |
| 203 source = "pipeline_test_manifest.json" | 203 source = "pipeline_test_manifest.json" |
| 204 } | 204 } |
| OLD | NEW |