diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 19:04:50 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 19:04:50 +0000 |
| commit | 7ef52bf5efc171bfe16db94580ea6b3b49691bd3 (patch) | |
| tree | e63dc8e500aa97dbc6a87d0680f3708c00b3cd1c /chrome/browser/metrics | |
| parent | 8c9f3b39071d565c338726109c4a2ac57fc906c6 (diff) | |
| download | chromium_src-7ef52bf5efc171bfe16db94580ea6b3b49691bd3.zip chromium_src-7ef52bf5efc171bfe16db94580ea6b3b49691bd3.tar.gz chromium_src-7ef52bf5efc171bfe16db94580ea6b3b49691bd3.tar.bz2 | |
Linux: add GYP flag to build with system libbz2.
This follows the general style of r21663, which we agreed was the way
to do this.
Note that, currently, one cannot build with system libbz2 on a 64-bit
system since it's not part of the ia32-compat package.
http://codereview.chromium.org/165016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/metrics')
| -rw-r--r-- | chrome/browser/metrics/metrics_service.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index c610cdf..ae4330d 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. |