Drop sys-assert leftovers

Change-Id: Ia220cc73a1b1e60f165aedd58cdfe9360c8de63b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 630e1aa..cf0df7b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,11 +10,6 @@ ADD_SUBDIRECTORY(include)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 ADD_SUBDIRECTORY(src/crash-manager)
-
-IF("${SYS_ASSERT}" STREQUAL "ON")
-       ADD_SUBDIRECTORY(src/sys-assert)
-ENDIF("${SYS_ASSERT}" STREQUAL "ON")
-
 ADD_SUBDIRECTORY(src/crash-stack)
 ADD_SUBDIRECTORY(src/dump_systemstate)
 

diff --git a/include/defs.h.in b/include/defs.h.in
index 3ac9871..30b61f4 100644 (file)
--- a/include/defs.h.in
+++ b/include/defs.h.in
@@ -6,7 +6,6 @@
 #define CRASH_PATH                     "@CRASH_PATH@"
 #define CRASH_ROOT_PATH                        "@CRASH_ROOT_PATH@"
 #define CRASH_TEMP                     "@CRASH_TEMP@"
-#define SYS_ASSERT                     "@SYS_ASSERT@"
 #define CRASH_STACK_BIN_PATH           "@CRASH_STACK_BIN_PATH@"
 #define CRASH_POPUP_BIN_PATH           "@CRASH_POPUP_BIN_PATH@"
 #define CRASH_NOTIFY_BIN_PATH          "@CRASH_NOTIFY_BIN_PATH@"

diff --git a/src/crash-manager/crash-manager.h b/src/crash-manager/crash-manager.h
index 7c102bc..1e4dbe5 100644 (file)
--- a/src/crash-manager/crash-manager.h
+++ b/src/crash-manager/crash-manager.h
@@ -28,14 +28,17 @@
 
 /* Paths and variables */
 struct crash_info {
+       bool livedump;
+       bool kill;
+       bool print_result_path;
        pid_t pid_info;
        pid_t tid_info;
        int uid_info;
        int gid_info;
        int sig_info;
+       int prstatus_fd;
        char *cmd_line;
        char *cmd_path;
-       time_t time_info;
        char *temp_dir;
        char *name;
        char *result_path;
@@ -43,17 +46,10 @@ struct crash_info {
        char *info_path;
        char *core_path;
        char *log_path;
+       char *output_path;
        char appid[APPID_MAX];
        char pkgid[PKGNAME_MAX];
-       char *output_path;
-       bool livedump;
-       bool kill;
-       bool print_result_path;
-#ifdef SYS_ASSERT
-       char *sysassert_cs_path;
-       bool have_sysassert_report;
-#endif
-       int prstatus_fd;
+       time_t time_info;
 };
 
 bool crash_manager_direct(struct crash_info *cinfo);