diff options
Diffstat (limited to 'chromium/chrome/app/BUILD.gn')
| -rw-r--r-- | chromium/chrome/app/BUILD.gn | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/chromium/chrome/app/BUILD.gn b/chromium/chrome/app/BUILD.gn index e5744a9d05d..4f74e74cfda 100644 --- a/chromium/chrome/app/BUILD.gn +++ b/chromium/chrome/app/BUILD.gn @@ -11,6 +11,7 @@ import("//printing/buildflags/buildflags.gni") import("//services/catalog/public/tools/catalog.gni") import("//services/service_manager/public/service_manifest.gni") import("//tools/grit/grit_rule.gni") +import("//tools/ipc_fuzzer/ipc_fuzzer.gni") # This target is for dependency tracking for the command ID header. source_set("command_ids") { @@ -21,10 +22,12 @@ source_set("command_ids") { # TODO: put back in chrome/browser if necessary. http://crbug.com/771801. source_set("shutdown_signal_handlers") { - sources = [ - "shutdown_signal_handlers_posix.cc", - "shutdown_signal_handlers_posix.h", - ] + if (is_posix || is_fuchsia) { + sources = [ + "shutdown_signal_handlers_posix.cc", + "shutdown_signal_handlers_posix.h", + ] + } deps = [ "//base", ] @@ -49,7 +52,7 @@ source_set("chrome_dll_resources") { # The resource compiler can only handle macro functions up to 31 chars # which the buildflag system produces for this. Make a define so we can # toggle off of the enable-basic-printing flag in the .rc file. - defines = [ "ENABLE_BASIC_PRINTING_FOR_RC" ] + defines = [ "ENABLE_PRINTING_FOR_RC" ] } deps += [ "//printing/buildflags" ] } @@ -393,20 +396,23 @@ chrome_packaged_services = [ "//services/preferences:local_state_manifest", ] +if (enable_basic_printing) { + chrome_packaged_services += + [ "//components/services/pdf_compositor:pdf_compositor_manifest" ] +} + if (enable_print_preview) { chrome_packaged_services += [ "//chrome/services/printing:manifest" ] } -if (enable_basic_printing || enable_print_preview) { +if (enable_extensions) { chrome_packaged_services += - [ "//components/printing/service:pdf_compositor_manifest" ] + [ "//chrome/services/removable_storage_writer:manifest" ] } -if (enable_extensions) { - chrome_packaged_services += [ - "//chrome/services/media_gallery_util:manifest", - "//chrome/services/removable_storage_writer:manifest", - ] +if (enable_extensions || is_android) { + chrome_packaged_services += + [ "//chrome/services/media_gallery_util:manifest" ] } if (is_chromeos) { @@ -441,7 +447,8 @@ service_manifest("chrome_content_packaged_services_manifest_overlay") { packaged_services += [ "//ash/components/autoclick:manifest", "//ash/components/quick_launch:manifest", - "//ash/components/touch_hud:manifest", + "//ash/components/shortcut_viewer:manifest", + "//ash/components/tap_visualizer:manifest", "//ash:manifest", "//components/services/font:manifest", ] @@ -493,7 +500,7 @@ group("chrome_content_manifest_overlays") { ] } -if (use_aura) { +if (use_aura || enable_ipc_fuzzer) { # NOTE: These rules generate compiled versions of the content service # manifests with Chrome's overlays applied. These are only used at run-time, # and only when running Chrome inside the Mash environment. In production |