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("//printing/features/features.gni") | 7 import("//printing/features/features.gni") |
8 import("//services/service_manager/public/service_manifest.gni") | 8 import("//services/service_manager/public/service_manifest.gni") |
9 import("//tools/grit/grit_rule.gni") | 9 import("//tools/grit/grit_rule.gni") |
10 | 10 |
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
346 } | 346 } |
347 | 347 |
348 if (enable_plugins && enable_nacl) { | 348 if (enable_plugins && enable_nacl) { |
349 deps += [ | 349 deps += [ |
350 "//components/nacl/browser", | 350 "//components/nacl/browser", |
351 "//components/nacl/renderer/plugin:nacl_trusted_plugin", | 351 "//components/nacl/renderer/plugin:nacl_trusted_plugin", |
352 ] | 352 ] |
353 } | 353 } |
354 } | 354 } |
355 | 355 |
| 356 service_manifest_overlay("chrome_content_browser_manifest_overlay") { |
| 357 source = "//chrome/browser/chrome_content_browser_manifest_overlay.json" |
| 358 packaged_services = [ "image_decoder" ] |
| 359 deps = [ |
| 360 "//services/image_decoder:manifest", |
| 361 ] |
| 362 } |
| 363 |
356 if (use_aura) { | 364 if (use_aura) { |
357 # NOTE: These rules generate compiled versions of the content service | 365 # NOTE: These rules generate compiled versions of the content service |
358 # manifests with Chrome's overlays applied. These are only used at run-time, | 366 # manifests with Chrome's overlays applied. These are only used at run-time, |
359 # and only when running Chrome inside the Mash environment. In production | 367 # and only when running Chrome inside the Mash environment. In production |
360 # Chrome, the content manifests and Chrome's overlays are baked into browser | 368 # Chrome, the content manifests and Chrome's overlays are baked into browser |
361 # resources and merged at runtime. | 369 # resources and merged at runtime. |
362 | 370 |
363 service_manifest("chrome_content_browser_manifest") { | 371 service_manifest("chrome_content_browser_manifest") { |
364 name = "content_browser" | 372 name = "content_browser" |
365 output_name = "chrome_content_browser" | 373 output_name = "chrome_content_browser" |
366 source = "${root_out_dir}/Packages/content_browser/manifest.json" | 374 source = "${root_out_dir}/Packages/content_browser/manifest.json" |
367 overlays = | 375 overlays = |
368 [ "//chrome/browser/chrome_content_browser_manifest_overlay.json" ] | 376 [ "${root_gen_dir}/chrome_content_browser_manifest_overlay.json" ] |
369 deps = [ | 377 deps = [ |
| 378 ":chrome_content_browser_manifest_overlay", |
370 "//content/public/app:browser_manifest", | 379 "//content/public/app:browser_manifest", |
371 ] | 380 ] |
372 } | 381 } |
373 | 382 |
374 service_manifest("chrome_content_gpu_manifest") { | 383 service_manifest("chrome_content_gpu_manifest") { |
375 name = "content_gpu" | 384 name = "content_gpu" |
376 output_name = "chrome_content_gpu" | 385 output_name = "chrome_content_gpu" |
377 source = "${root_out_dir}/Packages/content_gpu/manifest.json" | 386 source = "${root_out_dir}/Packages/content_gpu/manifest.json" |
378 overlays = [ "//chrome/browser/chrome_content_gpu_manifest_overlay.json" ] | 387 overlays = [ "//chrome/browser/chrome_content_gpu_manifest_overlay.json" ] |
379 deps = [ | 388 deps = [ |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
417 group("service_manifests") { | 426 group("service_manifests") { |
418 data_deps = [ | 427 data_deps = [ |
419 ":chrome_content_browser_manifest", | 428 ":chrome_content_browser_manifest", |
420 ":chrome_content_gpu_manifest", | 429 ":chrome_content_gpu_manifest", |
421 ":chrome_content_plugin_manifest", | 430 ":chrome_content_plugin_manifest", |
422 ":chrome_content_renderer_manifest", | 431 ":chrome_content_renderer_manifest", |
423 ":chrome_content_utility_manifest", | 432 ":chrome_content_utility_manifest", |
424 ] | 433 ] |
425 } | 434 } |
426 } | 435 } |
OLD | NEW |