fixup! [M120 Migration] Disable crashpad initialization.

This commit disables the crash reporter and removes
chrome_crashpad_handler executable.

Change-Id: I98d30fdb1269e76711c7727bf285f66e14986640
Signed-off-by: Insoon Kim <is46.kim@samsung.com>

diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 525ee1b90761a073782af297b94b91a1e901c808..e9124ada85ed58ef333e0746dea8bc1bafb02aca 100644 (file)
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -1676,12 +1676,10 @@ void ChromeMainDelegate::PreSandboxStartup() {
     } else {
       breakpad::InitCrashReporter(process_type);
     }
-#else
-#if !defined(SAMSUNG_NEXT_BROWSER) || !BUILDFLAG(IS_TIZEN)
+#elif !BUILDFLAG(IS_TIZEN)
     crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
     crash_reporter::SetFirstChanceExceptionHandler(
         v8::TryHandleWebAssemblyTrapPosix);
-#endif
 #endif  // BUILDFLAG(IS_ANDROID)
   }
 #endif  // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
@@ -1835,16 +1833,14 @@ void ChromeMainDelegate::ZygoteForked() {
   } else {
     breakpad::InitCrashReporter(process_type);
   }
-#else
-#if !defined(SAMSUNG_NEXT_BROWSER) || !BUILDFLAG(IS_TIZEN)
+#elif !BUILDFLAG(IS_TIZEN)
   crash_reporter::InitializeCrashpad(false, process_type);
   crash_reporter::SetFirstChanceExceptionHandler(
       v8::TryHandleWebAssemblyTrapPosix);
-#endif
 #endif
 
   // Reset the command line for the newly spawned process.
-#if !defined(SAMSUNG_NEXT_BROWSER) || !BUILDFLAG(IS_TIZEN)
+#if !defined(SAMSUNG_NEXT_BROWSER)
   crash_keys::SetCrashKeysFromCommandLine(*command_line);
 #endif
 }

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 9d6f0eff05315fda57aa3ee736553d5f90a70c65..325aaab431336432d962d99ab27ce1f307a74a17 100644 (file)
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2645,6 +2645,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
     enable_crash_reporter = breakpad::IsCrashReporterEnabled();
   }
 #elif BUILDFLAG(IS_TIZEN)
+  // Disable chrome_crashpad_handler on Tizen
   bool enable_crash_reporter = false;
 #else
   bool enable_crash_reporter = true;

diff --git a/packaging/chromium-efl.spec b/packaging/chromium-efl.spec
index 24f36aabbc645761b2d512ad5b8627d916dc2b37..4fdf10056666ab8e7ce438aa7bec8f13d9e08719 100644 (file)
--- a/packaging/chromium-efl.spec
+++ b/packaging/chromium-efl.spec
@@ -1075,8 +1075,6 @@ install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
 %if %{__build_chrome} == 1 && "%{__generate_tpk}" == "0"
   install -m 0755 "%{OUTPUT_FOLDER}"/%{__browser_binary_name} "%{buildroot}"%{CHROMIUM_LIB_DIR}/bin/%{__browser_binary_name}
   sed 's#@binary@#%{CHROMIUM_LIB_DIR}/bin/%{__browser_binary_name}#' %{SOURCE1} > "%{buildroot}"%{_bindir}/%{__browser_binary_name}
-  install -m 0755 "%{OUTPUT_FOLDER}"/chrome_crashpad_handler "%{buildroot}"%{CHROMIUM_LIB_DIR}/bin/chrome_crashpad_handler
-  sed 's#@binary@#%{CHROMIUM_LIB_DIR}/bin/chrome_crashpad_handler#' %{SOURCE1} > "%{buildroot}"%{_bindir}/chrome_crashpad_handler
   install -m 0644 "%{OUTPUT_FOLDER}"/locales/*.pak "%{buildroot}"%{CHROMIUM_LIB_DIR}/bin/locales
   install -m 0644 "%{OUTPUT_FOLDER}"/chrome_100_percent.pak "%{buildroot}"%{CHROMIUM_LIB_DIR}/bin/
   install -m 0644 "%{OUTPUT_FOLDER}"/resources.pak "%{buildroot}"%{CHROMIUM_LIB_DIR}/bin/
@@ -1625,8 +1623,6 @@ rm -rf %{TIZEN_V8_UT_DIR}/v8
   %{CHROMIUM_LIB_DIR}/bin/resources.pak
   %{CHROMIUM_LIB_DIR}/bin/%{__browser_binary_name}
   %{_bindir}/%{__browser_binary_name}
-  %{CHROMIUM_LIB_DIR}/bin/chrome_crashpad_handler
-  %{_bindir}/chrome_crashpad_handler
 %endif
   %{_libdir}/libchromium-ewk.so
   %{_libdir}/libewebkit2.so*