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

Commit 1b4be16f authored by Steve Fung's avatar Steve Fung Committed by Android Git Automerger
Browse files

am b949867c: am 855b618f: Merge "crash_reporter: Fix header include paths" 

* commit 'b949867c':
  crash_reporter: Fix header include paths
parents 81424120 b949867c

crash_reporter/chrome_collector.cc

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.



#include "crash-reporter/chrome_collector.h"

#include "chrome_collector.h"



#include <pcrecpp.h>

#include <stdint.h>

crash_reporter/chrome_collector.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <base/macros.h>

#include <gtest/gtest_prod.h>  // for FRIEND_TEST



#include "crash-reporter/crash_collector.h"

#include "crash_collector.h"

#include "debugd/dbus-proxies.h"



class SystemLogging;

crash_reporter/chrome_collector_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.



#include "crash-reporter/chrome_collector.h"

#include "chrome_collector.h"



#include <stdio.h>

crash_reporter/crash_collector.cc

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.



#include "crash-reporter/crash_collector.h"

#include "crash_collector.h"



#include <dirent.h>

#include <fcntl.h>  // For file creation modes.

crash_reporter/crash_collector_test.cc

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.



#include "crash-reporter/crash_collector_test.h"

#include "crash_collector_test.h"



#include <unistd.h>

#include <utility>
@@ -13,7 +13,7 @@ 
#include <chromeos/syslog_logging.h>

#include <gtest/gtest.h>



#include "crash-reporter/crash_collector.h"

#include "crash_collector.h"



using base::FilePath;

using base::StringPrintf;