From 57b261cf04f45d67b02f6bea8ad2c37734da86e0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 11 Apr 2012 14:47:09 -0400 Subject: [PATCH] update to newer libbase BUG=chromium-os:25872 TEST=`emerge-x86-alex crash-reporter` works TEST=`cros_run_unit_tests --board=x86-alex -p crash-reporter` passed Change-Id: Iff428b1364f96533d2d2290272823c2c84c48933 Reviewed-on: https://gerrit.chromium.org/gerrit/20008 Commit-Ready: Mike Frysinger Reviewed-by: Mike Frysinger Tested-by: Mike Frysinger --- crash_reporter/Makefile | 4 ++-- crash_reporter/crash_collector.cc | 1 + crash_reporter/crash_collector_test.cc | 3 ++- crash_reporter/crash_reporter.cc | 1 + crash_reporter/kernel_collector.cc | 3 ++- crash_reporter/kernel_collector_test.cc | 3 ++- crash_reporter/user_collector.cc | 3 ++- crash_reporter/user_collector_test.cc | 4 ++-- 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/crash_reporter/Makefile b/crash_reporter/Makefile index 9a25a8839..b8870a7d7 100644 --- a/crash_reporter/Makefile +++ b/crash_reporter/Makefile @@ -1,8 +1,8 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -BASE_VER = 85268 +BASE_VER ?= 125070 PKG_CONFIG ?= pkg-config CRASH_REPORTER = crash_reporter diff --git a/crash_reporter/crash_collector.cc b/crash_reporter/crash_collector.cc index 6046dc553..8b80f3715 100644 --- a/crash_reporter/crash_collector.cc +++ b/crash_reporter/crash_collector.cc @@ -21,6 +21,7 @@ #include "base/logging.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "chromeos/process.h" static const char kCollectChromeFile[] = diff --git a/crash_reporter/crash_collector_test.cc b/crash_reporter/crash_collector_test.cc index d98e1af97..2635bbfcc 100644 --- a/crash_reporter/crash_collector_test.cc +++ b/crash_reporter/crash_collector_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +// Copyright (c) 2012 The Chromium OS Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,6 +6,7 @@ #include "base/file_util.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "chromeos/syslog_logging.h" #include "chromeos/test_helpers.h" #include "crash-reporter/crash_collector.h" diff --git a/crash_reporter/crash_reporter.cc b/crash_reporter/crash_reporter.cc index 263caf42e..4fab0b7aa 100644 --- a/crash_reporter/crash_reporter.cc +++ b/crash_reporter/crash_reporter.cc @@ -12,6 +12,7 @@ #include "base/logging.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "chromeos/syslog_logging.h" #include "crash-reporter/kernel_collector.h" #include "crash-reporter/unclean_shutdown_collector.h" diff --git a/crash_reporter/kernel_collector.cc b/crash_reporter/kernel_collector.cc index 0895b4eb3..e15dc8553 100644 --- a/crash_reporter/kernel_collector.cc +++ b/crash_reporter/kernel_collector.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +// Copyright (c) 2012 The Chromium OS Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,6 +7,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/string_util.h" +#include "base/stringprintf.h" static const char kDefaultKernelStackSignature[] = "kernel-UnspecifiedStackSignature"; diff --git a/crash_reporter/kernel_collector_test.cc b/crash_reporter/kernel_collector_test.cc index 873a5a7cd..59f435a2e 100644 --- a/crash_reporter/kernel_collector_test.cc +++ b/crash_reporter/kernel_collector_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +// Copyright (c) 2012 The Chromium OS Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,6 +6,7 @@ #include "base/file_util.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "chromeos/syslog_logging.h" #include "chromeos/test_helpers.h" #include "crash-reporter/kernel_collector.h" diff --git a/crash_reporter/user_collector.cc b/crash_reporter/user_collector.cc index 28c5ce6c9..b060bd69d 100644 --- a/crash_reporter/user_collector.cc +++ b/crash_reporter/user_collector.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +// Copyright (c) 2012 The Chromium OS Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -19,6 +19,7 @@ #include "base/logging.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "chromeos/process.h" #include "chromeos/syslog_logging.h" #include "gflags/gflags.h" diff --git a/crash_reporter/user_collector_test.cc b/crash_reporter/user_collector_test.cc index 2d3ac0c76..8fcbaefd6 100644 --- a/crash_reporter/user_collector_test.cc +++ b/crash_reporter/user_collector_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +// Copyright (c) 2012 The Chromium OS Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "base/file_util.h" #include "base/string_split.h" -#include "base/memory/scoped_temp_dir.h" +#include "base/scoped_temp_dir.h" #include "chromeos/syslog_logging.h" #include "chromeos/test_helpers.h" #include "crash-reporter/user_collector.h"