Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf159b2e authored by Steve Fung's avatar Steve Fung Committed by android-build-merger
Browse files

Merge "crash_reporter: Remove udev collector from Android build" am: 047597b3 

am: 312292e7

* commit '312292e7':
  crash_reporter: Remove udev collector from Android build
parents e803dd8a 312292e7

crash_reporter/Android.mk

+0 −2
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ crash_reporter_cpp_extension := .cc 
crash_reporter_src := crash_collector.cc \

crash_reporter_src := crash_collector.cc \

    kernel_collector.cc \

    kernel_collector.cc \

    kernel_warning_collector.cc \

    kernel_warning_collector.cc \

    udev_collector.cc \

    unclean_shutdown_collector.cc \

    unclean_shutdown_collector.cc \

    user_collector.cc

    user_collector.cc
@@ -29,7 +28,6 @@ crash_reporter_test_src := crash_collector_test.cc \ 
    crash_reporter_logs_test.cc \

    crash_reporter_logs_test.cc \

    kernel_collector_test.cc \

    kernel_collector_test.cc \

    testrunner.cc \

    testrunner.cc \

    udev_collector_test.cc \

    unclean_shutdown_collector_test.cc \

    unclean_shutdown_collector_test.cc \

    user_collector_test.cc

    user_collector_test.cc

crash_reporter/crash_reporter.cc

+15 −1
Original line number Original line Diff line number Diff line
@@ -35,10 +35,13 @@ 




#include "kernel_collector.h"

#include "kernel_collector.h"

#include "kernel_warning_collector.h"

#include "kernel_warning_collector.h"

#include "udev_collector.h"

#include "unclean_shutdown_collector.h"

#include "unclean_shutdown_collector.h"

#include "user_collector.h"

#include "user_collector.h"





#if !defined(__ANDROID__)

#include "udev_collector.h"

#endif



static const char kCrashCounterHistogram[] = "Logging.CrashCounter";

static const char kCrashCounterHistogram[] = "Logging.CrashCounter";

static const char kKernelCrashDetected[] = "/var/run/kernel-crash-detected";

static const char kKernelCrashDetected[] = "/var/run/kernel-crash-detected";

static const char kUncleanShutdownDetected[] =

static const char kUncleanShutdownDetected[] =
@@ -176,6 +179,7 @@ static int HandleUserCrash(UserCollector *user_collector, 
  return 0;

  return 0;

}

}





#if !defined(__ANDROID__)

static int HandleUdevCrash(UdevCollector *udev_collector,

static int HandleUdevCrash(UdevCollector *udev_collector,

                           const std::string& udev_event) {

                           const std::string& udev_event) {

  // Handle a crash indicated by a udev event.

  // Handle a crash indicated by a udev event.
@@ -189,6 +193,7 @@ static int HandleUdevCrash(UdevCollector *udev_collector, 
    return 1;

    return 1;

  return 0;

  return 0;

}

}

#endif





static int HandleKernelWarning(KernelWarningCollector

static int HandleKernelWarning(KernelWarningCollector

                               *kernel_warning_collector) {

                               *kernel_warning_collector) {
@@ -249,7 +254,11 @@ int main(int argc, char *argv[]) { 
  DEFINE_bool(crash_test, false, "Crash test");

  DEFINE_bool(crash_test, false, "Crash test");

  DEFINE_string(user, "", "User crash info (pid:signal:exec_name)");

  DEFINE_string(user, "", "User crash info (pid:signal:exec_name)");

  DEFINE_bool(unclean_check, true, "Check for unclean shutdown");

  DEFINE_bool(unclean_check, true, "Check for unclean shutdown");



#if !defined(__ANDROID__)

  DEFINE_string(udev, "", "Udev event description (type:device:subsystem)");

  DEFINE_string(udev, "", "Udev event description (type:device:subsystem)");

#endif



  DEFINE_bool(kernel_warning, false, "Report collected kernel warning");

  DEFINE_bool(kernel_warning, false, "Report collected kernel warning");

  DEFINE_string(pid, "", "PID of crashing process");

  DEFINE_string(pid, "", "PID of crashing process");

  DEFINE_string(uid, "", "UID of crashing process");

  DEFINE_string(uid, "", "UID of crashing process");
@@ -279,8 +288,11 @@ int main(int argc, char *argv[]) { 
  UncleanShutdownCollector unclean_shutdown_collector;

  UncleanShutdownCollector unclean_shutdown_collector;

  unclean_shutdown_collector.Initialize(CountUncleanShutdown,

  unclean_shutdown_collector.Initialize(CountUncleanShutdown,

                                        IsFeedbackAllowed);

                                        IsFeedbackAllowed);



#if !defined(__ANDROID__)

  UdevCollector udev_collector;

  UdevCollector udev_collector;

  udev_collector.Initialize(CountUdevCrash, IsFeedbackAllowed);

  udev_collector.Initialize(CountUdevCrash, IsFeedbackAllowed);

#endif





  KernelWarningCollector kernel_warning_collector;

  KernelWarningCollector kernel_warning_collector;

  kernel_warning_collector.Initialize(CountUdevCrash, IsFeedbackAllowed);

  kernel_warning_collector.Initialize(CountUdevCrash, IsFeedbackAllowed);
@@ -304,9 +316,11 @@ int main(int argc, char *argv[]) { 
                                   FLAGS_generate_kernel_signature);

                                   FLAGS_generate_kernel_signature);

  }

  }





#if !defined(__ANDROID__)

  if (!FLAGS_udev.empty()) {

  if (!FLAGS_udev.empty()) {

    return HandleUdevCrash(&udev_collector, FLAGS_udev);

    return HandleUdevCrash(&udev_collector, FLAGS_udev);

  }

  }

#endif





  if (FLAGS_kernel_warning) {

  if (FLAGS_kernel_warning) {

    return HandleKernelWarning(&kernel_warning_collector);

    return HandleKernelWarning(&kernel_warning_collector);