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("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
6 import("//chrome/common/features.gni") | 6 import("//chrome/common/features.gni") |
7 import("//ppapi/features/features.gni") | 7 import("//ppapi/features/features.gni") |
8 import("//printing/features/features.gni") | 8 import("//printing/features/features.gni") |
9 import("//services/catalog/public/tools/catalog.gni") | 9 import("//services/catalog/public/tools/catalog.gni") |
10 import("//services/service_manager/public/service_manifest.gni") | 10 import("//services/service_manager/public/service_manifest.gni") |
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 deps += [ | 359 deps += [ |
360 "//components/nacl/browser", | 360 "//components/nacl/browser", |
361 "//components/nacl/renderer/plugin:nacl_trusted_plugin", | 361 "//components/nacl/renderer/plugin:nacl_trusted_plugin", |
362 ] | 362 ] |
363 } | 363 } |
364 } | 364 } |
365 | 365 |
366 chrome_packaged_services = [ | 366 chrome_packaged_services = [ |
367 ":chrome_manifest", | 367 ":chrome_manifest", |
368 "//chrome/browser:preferences_manifest", | 368 "//chrome/browser:preferences_manifest", |
369 "//services/image_decoder:manifest", | |
370 ] | 369 ] |
371 | 370 |
372 service_manifest("chrome_manifest") { | 371 service_manifest("chrome_manifest") { |
373 source = "chrome_manifest.json" | 372 source = "chrome_manifest.json" |
374 } | 373 } |
375 | 374 |
376 service_manifest("chrome_content_packaged_services_manifest_overlay_for_mash") { | 375 service_manifest("chrome_content_packaged_services_manifest_overlay_for_mash") { |
377 source = | 376 source = |
378 "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json" | 377 "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json" |
379 packaged_services = chrome_packaged_services | 378 packaged_services = chrome_packaged_services |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
497 chrome_embedded_services + | 496 chrome_embedded_services + |
498 [ ":chrome_content_packaged_services_manifest_for_mash" ] | 497 [ ":chrome_content_packaged_services_manifest_for_mash" ] |
499 } | 498 } |
500 } | 499 } |
501 | 500 |
502 catalog("catalog") { | 501 catalog("catalog") { |
503 embedded_services = chrome_embedded_services + | 502 embedded_services = chrome_embedded_services + |
504 [ ":chrome_content_packaged_services_manifest" ] | 503 [ ":chrome_content_packaged_services_manifest" ] |
505 } | 504 } |
506 } | 505 } |
OLD | NEW |