Die glog, die!
Review URL: http://chromereview.prom.corp.google.com/1181050
git-svn-id: svn://chrome-svn/chromeos/trunk@171 06c00378-0e64-4dae-be16-12b19f9950a1
diff --git a/SConstruct b/SConstruct
index d4c97ed..fa03602 100644
--- a/SConstruct
+++ b/SConstruct
@@ -5,7 +5,7 @@
env = Environment()
env['CCFLAGS'] = '-g -fno-exceptions -Wall -Werror -D_FILE_OFFSET_BITS=64 ' + \
'-I/usr/include/libxml2'
-env['LIBS'] = Split('curl glog gtest ssl xml2 z')
+env['LIBS'] = Split('curl gtest ssl xml2 z')
env['CPPPATH'] = ['..']
env.ParseConfig('pkg-config --cflags --libs glib-2.0')
diff --git a/action.h b/action.h
index e973066..15f72df 100644
--- a/action.h
+++ b/action.h
@@ -10,7 +10,7 @@
#include <iostream>
#include "base/basictypes.h"
-#include <glog/logging.h>
+#include <base/logging.h>
#include "update_engine/action_processor.h"
diff --git a/action_pipe.h b/action_pipe.h
index 19926ed..8ece015 100644
--- a/action_pipe.h
+++ b/action_pipe.h
@@ -10,7 +10,7 @@
#include <map>
#include <string>
#include <tr1/memory>
-#include <glog/logging.h>
+#include <base/logging.h>
#include "base/basictypes.h"
// The structure of these classes (Action, ActionPipe, ActionProcessor, etc.)
diff --git a/file_writer.h b/file_writer.h
index 223cd6e..3b44a26 100644
--- a/file_writer.h
+++ b/file_writer.h
@@ -9,7 +9,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
-#include "glog/logging.h"
+#include "base/logging.h"
// FileWriter is a class that is used to (synchronously, for now) write to
// a file. This file is a thin wrapper around open/write/close system calls,
@@ -76,4 +76,4 @@
} // namespace chromeos_update_engine
-#endif // UPDATE_ENGINE_FILE_WRITER_H__
\ No newline at end of file
+#endif // UPDATE_ENGINE_FILE_WRITER_H__
diff --git a/http_fetcher_unittest.cc b/http_fetcher_unittest.cc
index 92edf69..f1e9c26 100644
--- a/http_fetcher_unittest.cc
+++ b/http_fetcher_unittest.cc
@@ -5,7 +5,7 @@
#include <unistd.h>
#include <base/scoped_ptr.h>
#include <glib.h>
-#include <glog/logging.h>
+#include <base/logging.h>
#include <gtest/gtest.h>
#include "update_engine/libcurl_http_fetcher.h"
#include "update_engine/mock_http_fetcher.h"
diff --git a/libcurl_http_fetcher.cc b/libcurl_http_fetcher.cc
index ab48694..624e6a9 100644
--- a/libcurl_http_fetcher.cc
+++ b/libcurl_http_fetcher.cc
@@ -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 "glog/logging.h"
+#include "base/logging.h"
#include "update_engine/libcurl_http_fetcher.h"
// This is a concrete implementation of HttpFetcher that uses libcurl to do the
diff --git a/libcurl_http_fetcher.h b/libcurl_http_fetcher.h
index 0ca31b6..433feeb 100644
--- a/libcurl_http_fetcher.h
+++ b/libcurl_http_fetcher.h
@@ -10,7 +10,7 @@
#include <curl/curl.h>
#include <glib.h>
#include "base/basictypes.h"
-#include "glog/logging.h"
+#include "base/logging.h"
#include "update_engine/http_fetcher.h"
// This is a concrete implementation of HttpFetcher that uses libcurl to do the
diff --git a/main.cc b/main.cc
index 21add3b..412020b 100644
--- a/main.cc
+++ b/main.cc
@@ -6,7 +6,7 @@
#include <stdio.h>
#include <iostream>
#include <glib.h>
-#include <glog/logging.h>
+#include <base/logging.h>
#include <libxml/parser.h>
#include <libxml/xpath.h>
diff --git a/mock_http_fetcher.cc b/mock_http_fetcher.cc
index 0c4209a..6459351 100644
--- a/mock_http_fetcher.cc
+++ b/mock_http_fetcher.cc
@@ -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 "glog/logging.h"
+#include "base/logging.h"
#include "update_engine/mock_http_fetcher.h"
// This is a mac implementation of HttpFetcher which is useful for testing.
diff --git a/mock_http_fetcher.h b/mock_http_fetcher.h
index 3dc0645..68cb731 100644
--- a/mock_http_fetcher.h
+++ b/mock_http_fetcher.h
@@ -7,7 +7,7 @@
#include <vector>
#include <glib.h>
-#include <glog/logging.h>
+#include <base/logging.h>
#include "update_engine/http_fetcher.h"
// This is a mock implementation of HttpFetcher which is useful for testing.
diff --git a/omaha_hash_calculator.cc b/omaha_hash_calculator.cc
index 41dcdee..2ef0f97 100644
--- a/omaha_hash_calculator.cc
+++ b/omaha_hash_calculator.cc
@@ -5,7 +5,7 @@
#include <openssl/bio.h>
#include <openssl/buffer.h>
#include <openssl/evp.h>
-#include "glog/logging.h"
+#include "base/logging.h"
#include "update_engine/omaha_hash_calculator.h"
namespace chromeos_update_engine {
diff --git a/test_utils.cc b/test_utils.cc
index 2791d44..6255119 100644
--- a/test_utils.cc
+++ b/test_utils.cc
@@ -10,7 +10,7 @@
#include <string>
#include <vector>
#include "update_engine/test_utils.h"
-#include "glog/logging.h"
+#include "base/logging.h"
#include "update_engine/file_writer.h"