pull in base/stringprintf.h explicitly
Newer libbase no longer implicitly includes the stringprintf.h header,
so building against it fails with missing StringPrintf definitions.
BUG=chromium-os:25872
TEST=`emerge-x86-alex update_engine` works with old & new libbase
Change-Id: Ia1ea842449c0382ee4c8e5abd3ddfb3012c3ff2f
Reviewed-on: https://gerrit.chromium.org/gerrit/19774
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/certificate_checker.cc b/certificate_checker.cc
index 579038e..1f19baf 100644
--- a/certificate_checker.cc
+++ b/certificate_checker.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.
@@ -8,6 +8,7 @@
#include <base/string_number_conversions.h>
#include <base/string_util.h>
+#include <base/stringprintf.h>
#include <base/logging.h>
#include <curl/curl.h>
#include <metrics/metrics_library.h>
diff --git a/certificate_checker_unittest.cc b/certificate_checker_unittest.cc
index ccff258..55168ba 100644
--- a/certificate_checker_unittest.cc
+++ b/certificate_checker_unittest.cc
@@ -1,10 +1,11 @@
-// 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.
#include <string>
#include <base/string_util.h>
+#include <base/stringprintf.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <metrics/metrics_library_mock.h>
diff --git a/cycle_breaker.cc b/cycle_breaker.cc
index 8400366..f1a2728 100644
--- a/cycle_breaker.cc
+++ b/cycle_breaker.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.
@@ -7,6 +7,7 @@
#include <set>
#include <utility>
#include "base/string_util.h"
+#include <base/stringprintf.h>
#include "update_engine/graph_utils.h"
#include "update_engine/tarjan.h"
#include "update_engine/utils.h"
diff --git a/delta_diff_generator.cc b/delta_diff_generator.cc
index c1ed86f..06952c6 100644
--- a/delta_diff_generator.cc
+++ b/delta_diff_generator.cc
@@ -20,6 +20,7 @@
#include <base/logging.h>
#include <base/memory/scoped_ptr.h>
#include <base/string_util.h>
+#include <base/stringprintf.h>
#include <bzlib.h>
#include "update_engine/bzip.h"
diff --git a/delta_performer.cc b/delta_performer.cc
index 66c23d4..471ce82 100644
--- a/delta_performer.cc
+++ b/delta_performer.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.
@@ -14,6 +14,7 @@
#include <base/memory/scoped_ptr.h>
#include <base/string_util.h>
+#include <base/stringprintf.h>
#include <google/protobuf/repeated_field.h>
#include "update_engine/bzip_extent_writer.h"
diff --git a/delta_performer_unittest.cc b/delta_performer_unittest.cc
index f9c1648..fbacb36 100644
--- a/delta_performer_unittest.cc
+++ b/delta_performer_unittest.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.
@@ -12,6 +12,7 @@
#include <base/file_util.h>
#include <base/memory/scoped_ptr.h>
#include <base/string_util.h>
+#include <base/stringprintf.h>
#include <google/protobuf/repeated_field.h>
#include <gtest/gtest.h>
diff --git a/filesystem_copier_action_unittest.cc b/filesystem_copier_action_unittest.cc
index 0e2f6d0..ccad03a 100644
--- a/filesystem_copier_action_unittest.cc
+++ b/filesystem_copier_action_unittest.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.
@@ -10,6 +10,7 @@
#include <base/eintr_wrapper.h>
#include <base/string_util.h>
+#include <base/stringprintf.h>
#include <glib.h>
#include <gtest/gtest.h>
diff --git a/filesystem_iterator_unittest.cc b/filesystem_iterator_unittest.cc
index 3ffdd70..aca95ff 100644
--- a/filesystem_iterator_unittest.cc
+++ b/filesystem_iterator_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium 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.
@@ -10,6 +10,7 @@
#include <vector>
#include <gtest/gtest.h>
#include "base/string_util.h"
+#include <base/stringprintf.h>
#include "update_engine/filesystem_iterator.h"
#include "update_engine/test_utils.h"
#include "update_engine/utils.h"
diff --git a/full_update_generator.cc b/full_update_generator.cc
index a7b630c..311cc28 100644
--- a/full_update_generator.cc
+++ b/full_update_generator.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.
@@ -10,6 +10,7 @@
#include <tr1/memory>
#include <base/string_util.h>
+#include <base/stringprintf.h>
#include "update_engine/bzip.h"
#include "update_engine/utils.h"
diff --git a/http_fetcher_unittest.cc b/http_fetcher_unittest.cc
index eb107ef..0ba1179 100644
--- a/http_fetcher_unittest.cc
+++ b/http_fetcher_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
@@ -11,6 +11,7 @@
#include <base/logging.h>
#include <base/memory/scoped_ptr.h>
#include <base/string_util.h>
+#include <base/stringprintf.h>
#include <glib.h>
#include <gtest/gtest.h>
diff --git a/main.cc b/main.cc
index fd84e50..790fe73 100644
--- a/main.cc
+++ b/main.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.
@@ -10,6 +10,7 @@
#include <base/file_util.h>
#include <base/logging.h>
#include <base/string_util.h>
+#include <base/stringprintf.h>
#include <gflags/gflags.h>
#include <glib.h>
#include <metrics/metrics_library.h>
diff --git a/metadata.cc b/metadata.cc
index bc7222b..1eec1cf 100644
--- a/metadata.cc
+++ b/metadata.cc
@@ -7,6 +7,7 @@
#include <vector>
#include <base/string_util.h>
+#include <base/stringprintf.h>
#include <et/com_err.h>
#include <ext2fs/ext2_io.h>
#include <ext2fs/ext2fs.h>
diff --git a/metadata_unittest.cc b/metadata_unittest.cc
index 885197d..dc10a6e 100644
--- a/metadata_unittest.cc
+++ b/metadata_unittest.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.
@@ -10,6 +10,7 @@
#include <vector>
#include <base/string_util.h>
+#include <base/stringprintf.h>
#include <gtest/gtest.h>
#include "update_engine/graph_types.h"
diff --git a/omaha_request_action.cc b/omaha_request_action.cc
index 8329c56..9be4fdc 100644
--- a/omaha_request_action.cc
+++ b/omaha_request_action.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.
@@ -10,6 +10,7 @@
#include <base/string_number_conversions.h>
#include <base/string_util.h>
+#include <base/stringprintf.h>
#include <base/time.h>
#include <base/logging.h>
#include <libxml/parser.h>
diff --git a/omaha_request_action_unittest.cc b/omaha_request_action_unittest.cc
index 26e808c..e4ab729 100644
--- a/omaha_request_action_unittest.cc
+++ b/omaha_request_action_unittest.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.
@@ -8,6 +8,7 @@
#include <glib.h>
#include "base/string_util.h"
+#include <base/stringprintf.h>
#include "base/time.h"
#include "gtest/gtest.h"
#include "update_engine/action_pipe.h"
diff --git a/postinstall_runner_action_unittest.cc b/postinstall_runner_action_unittest.cc
index 2229004..8f42ddd 100644
--- a/postinstall_runner_action_unittest.cc
+++ b/postinstall_runner_action_unittest.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.
@@ -10,6 +10,7 @@
#include <vector>
#include <base/string_util.h>
+#include <base/stringprintf.h>
#include <gtest/gtest.h>
#include "update_engine/postinstall_runner_action.h"
diff --git a/prefs_unittest.cc b/prefs_unittest.cc
index 87116e5..54a637e 100644
--- a/prefs_unittest.cc
+++ b/prefs_unittest.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.
@@ -9,6 +9,7 @@
#include "base/basictypes.h"
#include "base/file_util.h"
#include "base/string_util.h"
+#include "base/stringprintf.h"
#include "gtest/gtest.h"
#include "update_engine/prefs.h"
diff --git a/subprocess.cc b/subprocess.cc
index f0647e2..aec8bb7 100644
--- a/subprocess.cc
+++ b/subprocess.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.
@@ -14,6 +14,7 @@
#include <base/logging.h>
#include <base/memory/scoped_ptr.h>
#include <base/string_util.h>
+#include <base/stringprintf.h>
#include "update_engine/utils.h"
diff --git a/subprocess_unittest.cc b/subprocess_unittest.cc
index 6c0dcb2..ae67fbb 100644
--- a/subprocess_unittest.cc
+++ b/subprocess_unittest.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.
@@ -8,6 +8,7 @@
#include <string>
#include <vector>
#include "base/string_util.h"
+#include <base/stringprintf.h>
#include <glib.h>
#include <gtest/gtest.h>
#include "update_engine/subprocess.h"
diff --git a/test_http_server.cc b/test_http_server.cc
index 6257e07..08cf8e5 100644
--- a/test_http_server.cc
+++ b/test_http_server.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
@@ -28,6 +28,7 @@
#include <base/logging.h>
#include <base/string_split.h>
#include <base/string_util.h>
+#include <base/stringprintf.h>
#include "update_engine/http_common.h"
#include "update_engine/http_fetcher_unittest.h"
diff --git a/test_utils.cc b/test_utils.cc
index 0a30ddf..7e77519 100644
--- a/test_utils.cc
+++ b/test_utils.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
@@ -16,6 +16,7 @@
#include <vector>
#include "base/string_util.h"
+#include <base/stringprintf.h>
#include "base/logging.h"
#include "update_engine/file_writer.h"
#include "update_engine/filesystem_iterator.h"
diff --git a/utils.cc b/utils.cc
index 1c57fbf..3232061 100644
--- a/utils.cc
+++ b/utils.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.
@@ -22,9 +22,10 @@
#include <base/eintr_wrapper.h>
#include <base/file_path.h>
#include <base/file_util.h>
+#include <base/logging.h>
#include <base/rand_util.h>
#include <base/string_util.h>
-#include <base/logging.h>
+#include <base/stringprintf.h>
#include <google/protobuf/stubs/common.h>
#include <rootdev/rootdev.h>
diff --git a/utils_unittest.cc b/utils_unittest.cc
index 67a14db..39ae150 100644
--- a/utils_unittest.cc
+++ b/utils_unittest.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.
@@ -11,6 +11,7 @@
#include <vector>
#include <base/string_util.h>
+#include <base/stringprintf.h>
#include <gtest/gtest.h>
#include "update_engine/test_utils.h"