Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6141)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/metrics/metrics_service.cc

Issue 165016: Linux: add GYP flag to build with system libbz2. (Closed)
Patch Set: Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/common/bzip2_unittest.cc » ('j') | third_party/bzip2/bzip2.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/metrics/metrics_service.cc
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index c610cdf109a4e8731472a747e906610731c5b16f..ae4330d25ec2eec54d0ecb1d4ca85069aba7556b 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -162,6 +162,12 @@
#include <objbase.h>
#endif
+#if defined(USE_SYSTEM_LIBBZ2)
+#include <bzlib.h>
+#else
+#include "third_party/bzip2/bzlib.h"
+#endif
+
#include "base/file_path.h"
#include "base/histogram.h"
#include "base/path_service.h"
@@ -191,7 +197,6 @@
#include "chrome/common/render_messages.h"
#include "googleurl/src/gurl.h"
#include "net/base/load_flags.h"
-#include "third_party/bzip2/bzlib.h"
#if defined(OS_POSIX)
// TODO(port): Move these headers above as they are ported.
« no previous file with comments | « no previous file | chrome/common/bzip2_unittest.cc » ('j') | third_party/bzip2/bzip2.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698