Revert "[M120 Migration]Fix for crash during chrome exit"

[platform/framework/web/chromium-efl.git] / headless / BUILD.gn

diff --git a/headless/BUILD.gn b/headless/BUILD.gn
index 43dde35..dadca05 100644 (file)
--- a/headless/BUILD.gn
+++ b/headless/BUILD.gn
@@ -65,7 +65,6 @@ repack("resource_pack_data") {
   sources = [
     "$root_gen_dir/components/components_resources.pak",
     "$root_gen_dir/content/content_resources.pak",
-    "$root_gen_dir/content/dev_ui_content_resources.pak",
     "$root_gen_dir/net/net_resources.pak",
     "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
     "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_100_percent.pak",
@@ -76,7 +75,6 @@ repack("resource_pack_data") {
   deps = [
     "//components/resources:components_resources",
     "//content:content_resources",
-    "//content:dev_ui_content_resources",
     "//net:net_resources",
     "//third_party/blink/public:resources",
     "//third_party/blink/public:scaled_resources_100_percent",
@@ -95,11 +93,7 @@ repack("resource_pack_strings") {
     "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
   ]
 
-  if (is_chrome_branded) {
-    sources += [ "${root_gen_dir}/components/strings/components_google_chrome_strings_en-US.pak" ]
-  } else {
-    sources += [ "${root_gen_dir}/components/strings/components_chromium_strings_en-US.pak" ]
-  }
+  sources += [ "${root_gen_dir}/components/strings/components_${branding_path_product}_strings_en-US.pak" ]
 
   deps = [
     "//components/strings",
@@ -206,6 +200,7 @@ devtools_domains = [
   "runtime",
   "security",
   "service_worker",
+  "storage",
   "target",
   "tracing",
 ]
@@ -297,6 +292,7 @@ static_library("backend_cdp_bindings") {
   sources = get_target_outputs(":protocol_sources")
   visibility = [ ":headless_non_renderer" ]
   configs += [
+    "//build/config/compiler:wexit_time_destructors",
     ":headless_defines_config",
     ":inside_headless_component",
   ]
@@ -331,8 +327,6 @@ component("headless_non_renderer") {
     "lib/browser/headless_platform_event_source.h",
     "lib/browser/headless_request_context_manager.cc",
     "lib/browser/headless_request_context_manager.h",
-    "lib/browser/headless_select_file_dialog_factory.cc",
-    "lib/browser/headless_select_file_dialog_factory.h",
     "lib/browser/headless_web_contents_impl.cc",
     "lib/browser/headless_web_contents_impl.h",
     "lib/browser/headless_window_tree_host.h",
@@ -369,12 +363,14 @@ component("headless_non_renderer") {
     "public/util/user_agent.h",
   ]
 
+  configs += [ "//build/config/compiler:wexit_time_destructors" ]
+
   if (is_mac) {
     sources += [
       "lib/browser/headless_browser_impl_mac.mm",
-      "lib/browser/headless_browser_main_parts_mac.mm",
       "lib/browser/headless_shell_application_mac.h",
       "lib/browser/headless_shell_application_mac.mm",
+      "lib/headless_content_main_delegate_mac.mm",
     ]
   }
 
@@ -382,10 +378,6 @@ component("headless_non_renderer") {
     sources += [ "lib/browser/headless_browser_main_parts_posix.cc" ]
   }
 
-  if (is_win) {
-    sources += [ "lib/browser/headless_browser_main_parts_win.cc" ]
-  }
-
   if (use_aura) {
     sources += [
       "lib/browser/headless_browser_impl_aura.cc",
@@ -422,8 +414,6 @@ component("headless_non_renderer") {
     ":backend_cdp_bindings",
     ":gen_devtools_client_api",
     "//base:base_static",
-    "//base:base_static",
-    "//build:branding_buildflags",
     "//build:branding_buildflags",
     "//build:chromeos_buildflags",
     "//components/cookie_config",
@@ -434,47 +424,35 @@ component("headless_non_renderer") {
     "//components/embedder_support:embedder_support",
     "//components/embedder_support/origin_trials",
     "//components/headless/clipboard",
+    "//components/headless/command_handler:switches",
+    "//components/headless/select_file_dialog",
     "//components/keyed_service/content",
-    "//components/keyed_service/content:content",
     "//components/origin_trials:browser",
     "//components/origin_trials:common",
     "//components/os_crypt/sync",
     "//components/policy:generated",
-    "//components/policy/content:content",
+    "//components/policy/content",
     "//components/policy/core/common:common_constants",
     "//components/pref_registry",
-    "//components/pref_registry:pref_registry",
     "//components/prefs",
-    "//components/prefs:prefs",
     "//components/profile_metrics",
-    "//components/profile_metrics:profile_metrics",
     "//components/security_state/core",
     "//components/version_info",
     "//content/public/app",
-    "//content/public/app:app",
     "//content/public/browser",
-    "//content/public/browser:browser",
     "//content/public/common",
-    "//content/public/common",
-    "//content/public/renderer:renderer",
-    "//content/public/utility:utility",
-    "//printing/buildflags",
+    "//content/public/renderer",
+    "//content/public/utility",
     "//printing/buildflags",
     "//services/cert_verifier/public/mojom",
     "//services/device/public/cpp/geolocation",
-    "//services/device/public/cpp/geolocation:geolocation",
     "//services/service_manager/public/cpp",
     "//third_party/inspector_protocol:crdtp",
-    "//third_party/inspector_protocol:crdtp",
     "//ui/base",
     "//ui/compositor",
     "//ui/display",
     "//ui/events/devices",
-    "//ui/events/devices:devices",
     "//ui/gfx",
-    "//ui/shell_dialogs",
-    "//ui/shell_dialogs:shell_dialogs",
-    "//url",
     "//url",
   ]
 
@@ -491,6 +469,7 @@ component("headless_non_renderer") {
       "//components/headless/policy",
       "//components/policy/content",
       "//components/policy/core/browser",
+      "//components/policy/core/common:policy_path_constants",
     ]
   }
 
@@ -498,9 +477,7 @@ component("headless_non_renderer") {
     deps += [
       "//components/printing/browser",
       "//components/printing/browser/headless",
-      "//components/printing/browser/headless:headless",
-      "//components/printing/browser/print_to_pdf:print_to_pdf",
-      "//components/printing/browser/print_to_pdf:print_to_pdf",
+      "//components/printing/browser/print_to_pdf",
       "//components/printing/common:mojo_interfaces",
       "//components/printing/renderer:renderer",
       "//components/services/print_compositor",
@@ -514,10 +491,6 @@ component("headless_non_renderer") {
     deps += [ "//ui/ozone" ]
   }
 
-  if (is_mac) {
-    sources += [ "lib/headless_content_main_delegate_mac.mm" ]
-  }
-
   if (headless_use_prefs) {
     deps += [
       "//components/origin_trials:browser",
@@ -755,12 +728,11 @@ test("headless_browsertests") {
   }
 
   if (is_fuchsia) {
-    # TODO(https://crbug.com/1185811): Investigate removing the requirement for
-    # job_policy_ambient_mark_vmo_exec for the sake of V8's allocator in tests.
-    test_runner_shard = "//build/config/fuchsia/test/elf_test_ambient_exec_runner.shard.test-cml"
-
     additional_manifest_fragments = [
       "//build/config/fuchsia/test/fonts.shard.test-cml",
+
+      # TODO(https://crbug.com/1185811): Investigate removing the requirement
+      # for VmexResource.
       "//build/config/fuchsia/test/mark_vmo_executable.shard.test-cml",
       "//build/config/fuchsia/test/network.shard.test-cml",
       "//third_party/fuchsia-sdk/sdk/pkg/vulkan/client.shard.cml",
@@ -781,6 +753,7 @@ test("headless_browsertests") {
     "//components/embedder_support",
     "//components/embedder_support:browser_util",
     "//components/embedder_support:embedder_support",
+    "//components/headless/select_file_dialog",
     "//components/headless/test",
     "//components/policy/core/browser",
     "//components/security_state/content",
@@ -810,6 +783,7 @@ test("headless_browsertests") {
 
   if (enable_printing) {
     deps += [
+      "//components/headless/command_handler:switches",
       "//components/printing/browser",
       "//printing",
     ]
@@ -827,7 +801,10 @@ test("headless_browsertests") {
   }
 
   if (headless_enable_commands) {
-    deps += [ "//components/headless/command_handler" ]
+    deps += [
+      "//components/headless/command_handler",
+      "//components/headless/command_handler:switches",
+    ]
   }
 
   configs += [ ":headless_defines_config" ]
@@ -869,7 +846,10 @@ if (is_win) {
       deps += [ "//components/headless/command_handler" ]
     }
 
-    configs += [ ":headless_defines_config" ]
+    configs += [
+      ":headless_defines_config",
+      "//build/config/compiler:wexit_time_destructors",
+    ]
   }
 }
 
@@ -882,7 +862,7 @@ static_library("headless_shell_lib") {
   ]
   defines = []
 
-  if (!is_component_build) {
+  if (!is_component_build && !build_chrome) {
     sources += [
       "lib/utility/headless_content_utility_client.cc",
       "lib/utility/headless_content_utility_client.h",
@@ -957,7 +937,10 @@ static_library("headless_shell_lib") {
     deps += [ "//components/crash/core/app" ]
   }
 
-  configs += [ ":headless_defines_config" ]
+  configs += [
+    ":headless_defines_config",
+    "//build/config/compiler:wexit_time_destructors",
+  ]
 }
 
 executable("headless_shell") {
@@ -987,5 +970,8 @@ executable("headless_shell") {
     deps += [ "//sandbox/mac:seatbelt" ]
   }
 
-  configs += [ ":headless_defines_config" ]
+  configs += [
+    ":headless_defines_config",
+    "//build/config/compiler:wexit_time_destructors",
+  ]
 }