Merge pull request #10230 from wsnipex/fix-droid-packaging

[droid] fix build and cleanup after Breakpad removal

7 files changed, 4 insertions, 103 deletions

diff --git a/configure.ac b/configure.ac
index 539726e556..2f713c9303 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,8 +198,6 @@ libcap_disabled="== Capabilities detection support disabled. =="
 libcap_not_found="== Could not find libcap. Capabilities detection support disabled. =="
 gtest_enabled="== Google Test Framework will be configured. =="
 gtest_disabled="== Google Test Framework will not be configured. =="
-breakpad_enabled="== Google Breakpad will be configured. =="
-breakpad_disabled="== Google Breakpad Framework will not be configured. =="
 
 libudev_not_found="== Could not find libudev. Will use polling to check for device changes. =="
 libudev_disabled="== udev support disabled. Will use polling to check for device changes. =="
@@ -475,12 +473,6 @@ AC_ARG_ENABLE([gtest],
   [configure_gtest=$enableval],
   [configure_gtest=yes])
 
-AC_ARG_ENABLE([breakpad],
-  [AS_HELP_STRING([--enable-breakpad],
-  [configure Google Breakpad (default is no)])],
-  [use_breakpad=$enableval],
-  [use_breakpad=no])
-
 AC_ARG_ENABLE([codec],
   [AS_HELP_STRING([--enable-codec],
   [enable additional codecs from a list of comma separated names, (default is none, choices are amcodec and imxvpu)])],
@@ -742,11 +734,7 @@ else
     DEBUG_FLAGS="-pg -DNDEBUG=1"
   else
     final_message="$final_message\n  Profiling:\tNo"
-    if test "$use_breakpad" = "yes"; then
-       DEBUG_FLAGS="-g -DNDEBUG=1"
-    else
-       DEBUG_FLAGS="-DNDEBUG=1"
-    fi
+    DEBUG_FLAGS="-DNDEBUG=1"
   fi
 fi
 CFLAGS="$DEBUG_FLAGS $CFLAGS"
@@ -1983,21 +1971,6 @@ else
   SKIP_CONFIG_GTEST=1
 fi
 
-# Google Breakpad
-if test "$use_breakpad" = "yes"; then
-  USE_BREAKPAD=1
-  PKG_CHECK_MODULES([BREAKPAD],    [breakpad-client],
-    [INCLUDES="$INCLUDES $BREAKPAD_CFLAGS"; LIBS="$LIBS $BREAKPAD_LIBS"],
-    AC_MSG_ERROR("breakpad-client not found"))
-  AC_DEFINE([HAVE_BREAKPAD],[1],["Define to 1 if Google Breakpad is installed"])
-  AC_MSG_NOTICE($breakpad_enabled)
-  final_message="$final_message\n  Google Breakpad Configured:\tYes"
-else
-  AC_MSG_NOTICE($breakpad_disabled)
-  final_message="$final_message\n  Google Breakpad Configured:\tNo"
-  USE_BREAKPAD=0
-fi
-
 if test "$use_avahi" = "yes"; then
   final_message="$final_message\n  Avahi:\tYes"
 else
@@ -2318,7 +2291,6 @@ AC_SUBST(USE_SSE4)
 AC_SUBST(USE_MMAL)
 AC_SUBST(USE_X11)
 AC_SUBST(USE_OPTICAL_DRIVE)
-AC_SUBST(USE_BREAKPAD)
 AC_SUBST(CROSS_COMPILING)
 
 # pushd and popd are not available in other shells besides bash, so implement
diff --git a/project/cmake/modules/FindBreakpad.cmake b/project/cmake/modules/FindBreakpad.cmake
deleted file mode 100644
index f56177b230..0000000000
--- a/project/cmake/modules/FindBreakpad.cmake
+++ /dev/null
@@ -1,44 +0,0 @@
-#.rst:
-# FindBreakpad
-# ------------
-# Finds the Breakpad library
-#
-# This will will define the following variables::
-#
-# BREAKPAD_FOUND - system has Breakpad
-# BREAKPAD_INCLUDE_DIRS - the Breakpad include directory
-# BREAKPAD_LIBRARIES - the Breakpad libraries
-#
-# and the following imported targets::
-#
-#   Breakpad::Breakpad   - The Breakpad library
-
-if(PKG_CONFIG_FOUND)
-  pkg_check_modules(PC_BREAKPAD breakpad-client QUIET)
-endif()
-
-find_path(BREAKPAD_INCLUDE_DIR google_breakpad/common/breakpad_types.h
-                              PATH_SUFFIXES breakpad
-                              PATHS ${PC_BREAKPAD_INCLUDEDIR})
-find_library(BREAKPAD_LIBRARY NAMES breakpad_client
-                              PATHS ${PC_BREAKPAD_LIBDIR})
-set(BREAKPAD_VERSION ${PC_BREAKPAD_VERSION})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Breakpad
-                                  REQUIRED_VARS BREAKPAD_LIBRARY BREAKPAD_INCLUDE_DIR
-                                  VERSION_VAR BREAKPAD_VERSION)
-
-if(BREAKPAD_FOUND)
-  set(BREAKPAD_LIBRARIES ${BREAKPAD_LIBRARY})
-  set(BREAKPAD_INCLUDE_DIRS ${BREAKPAD_INCLUDE_DIR})
-
-  if(NOT TARGET Breakpad::Breakpad)
-    add_library(Breakpad::Breakpad UNKNOWN IMPORTED)
-    set_target_properties(Breakpad::Breakpad PROPERTIES
-                                             IMPORTED_LOCATION "${BREAKPAD_LIBRARY}"
-                                             INTERFACE_INCLUDE_DIRECTORIES "${BREAKPAD_INCLUDE_DIR}")
-  endif()
-endif()
-
-mark_as_advanced(BREAKPAD_INCLUDE_DIR BREAKPAD_LIBRARY)
diff --git a/project/cmake/scripts/android/Install.cmake b/project/cmake/scripts/android/Install.cmake
index 0558294cc6..e5094b3fe1 100644
--- a/project/cmake/scripts/android/Install.cmake
+++ b/project/cmake/scripts/android/Install.cmake
@@ -14,9 +14,6 @@ if(NOT ZIPALIGN_EXECUTABLE)
 endif()
 
 # Configure files into packaging environment.
-if(BREAKPAD_FOUND)
-  set(USE_BREAKPAD 1)
-endif()
 configure_file(${CORE_SOURCE_DIR}/tools/android/packaging/Makefile.in
                ${CMAKE_BINARY_DIR}/tools/android/packaging/Makefile @ONLY)
 configure_file(${CORE_SOURCE_DIR}/tools/android/packaging/apksign
diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in
index 7dc1183ffb..8682b0641b 100644
--- a/tools/android/packaging/Makefile.in
+++ b/tools/android/packaging/Makefile.in
@@ -72,12 +72,6 @@ apk-noobb: apk-clean package apk-sign
 xbmc/assets:
 	mkdir -p xbmc/assets
 
-symbols: libs
-ifeq (1,@USE_BREAKPAD@)
-	for f in xbmc/obj/local/$(CPU)/*.so; do sh ./make_symbols.sh $$f; done
-	tar -cjf @APP_NAME@.symbols-$(CPU)-`$(XBMCROOT)/tools/darwin/packaging/gitrev-posix`.tar.bz2 symbols
-endif
-
 shared:
 	mkdir -p assets
 	cp -rfp $(PREFIX)/share/@APP_NAME_LC@/* ./assets
@@ -140,7 +134,7 @@ xbmc/classes.dex: res
 	@javac -classpath $(SDKROOT)/platforms/$(SDK_PLATFORM)/android.jar:xbmc/obj -d xbmc/obj -sourcepath xbmc/src xbmc/src/org/xbmc/kodi/*.java
 	@$(DX) --dex --output=xbmc/classes.dex xbmc/obj
 
-package: libs symbols python xbmc/classes.dex
+package: libs python xbmc/classes.dex
 	@echo "Creating package..."
 	@cp images/@APP_NAME_LC@app-debug-skeleton.apk images/@APP_NAME_LC@app-debug-$(CPU)-unaligned.apk
 	@cd xbmc; $(ZIP) -r -q ../images/@APP_NAME_LC@app-debug-$(CPU)-unaligned.apk lib/$(CPU) assets classes.dex
@@ -159,7 +153,6 @@ $(SRCLIBS):
 
 apk-clean:
 	rm -rf images
-	rm -rf symbols
 	rm -rf xbmc/lib
 	rm -rf xbmc/libs
 	rm -rf xbmc/assets
diff --git a/tools/buildsteps/android/package b/tools/buildsteps/android/package
index ec32294bf5..833a2d9487 100644
--- a/tools/buildsteps/android/package
+++ b/tools/buildsteps/android/package
@@ -14,7 +14,7 @@ else
   cd $WORKSPACE;make -j$BUILDTHREADS $TARGET
 fi
 $RUN_SIGNSTEP
-mv tools/android/packaging/Kodi.symbols*.tar.bz2 $WORKSPACE/
+
 cd $WORKSPACE
 
 #rename for upload
diff --git a/tools/buildsteps/androidx86/package b/tools/buildsteps/androidx86/package
index 19249c688f..d1ca55f778 100644
--- a/tools/buildsteps/androidx86/package
+++ b/tools/buildsteps/androidx86/package
@@ -14,7 +14,7 @@ else
   cd $WORKSPACE;make -j$BUILDTHREADS $TARGET
 fi
 $RUN_SIGNSTEP
-mv tools/android/packaging/Kodi.symbols*.tar.bz2 $WORKSPACE/
+
 cd $WORKSPACE
 
 #rename for upload
diff --git a/xbmc/platform/xbmc.cpp b/xbmc/platform/xbmc.cpp
index 74ee5f93aa..3ecd656cd2 100644
--- a/xbmc/platform/xbmc.cpp
+++ b/xbmc/platform/xbmc.cpp
@@ -25,11 +25,6 @@
 #include "linux/RBP.h"
 #endif
 
-#if defined(HAVE_BREAKPAD)
-#include "filesystem/SpecialProtocol.h"
-#include "client/linux/handler/exception_handler.h"
-#endif
-
 #ifdef TARGET_WINDOWS
 #include <mmdeviceapi.h>
 #include "platform/win32/IMMNotificationClient.h"
@@ -60,18 +55,6 @@ extern "C" int XBMC_Run(bool renderGUI)
     return status;
   }
 
-#if defined(HAVE_BREAKPAD)
-  // Must have our TEMP dir fixed first
-  std::string tempPath = CSpecialProtocol::TranslatePath("special://temp/");
-  google_breakpad::MinidumpDescriptor descriptor(tempPath.c_str());
-  google_breakpad::ExceptionHandler eh(descriptor,
-                                       NULL,
-                                       NULL,
-                                       NULL,
-                                       true,
-                                       -1);
-#endif
-
 #ifdef TARGET_RASPBERRY_PI
   if(!g_RBP.Initialize())
     return false;