summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 23:37:03 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 23:37:03 +0000
commite33cba46498a40774bc6d33a9258afbd5fa059e6 (patch)
tree4ce6b22f4f7b2b245b2d89bb9209a53e3274b263 /app
parentaaf6472fd01db928919d4dc13687bde2a4b5c7b9 (diff)
downloadchromium_src-e33cba46498a40774bc6d33a9258afbd5fa059e6.zip
chromium_src-e33cba46498a40774bc6d33a9258afbd5fa059e6.tar.gz
chromium_src-e33cba46498a40774bc6d33a9258afbd5fa059e6.tar.bz2
Move bundled copy of sqlite one level deeper to better separate it
from our patches, READMEs, etc. Also, add a shim header so we can use it for building with system sqlite. TEST=compile BUG=22208 Review URL: http://codereview.chromium.org/3108030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r--app/sql/connection.cc2
-rw-r--r--app/sql/connection_unittest.cc2
-rw-r--r--app/sql/statement.cc2
-rw-r--r--app/sql/statement_unittest.cc2
-rw-r--r--app/sql/transaction_unittest.cc2
5 files changed, 5 insertions, 5 deletions
diff --git a/app/sql/connection.cc b/app/sql/connection.cc
index 81f3d36..62ebfaf 100644
--- a/app/sql/connection.cc
+++ b/app/sql/connection.cc
@@ -11,7 +11,7 @@
#include "base/logging.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
-#include "third_party/sqlite/preprocessed/sqlite3.h"
+#include "third_party/sqlite/sqlite3.h"
namespace sql {
diff --git a/app/sql/connection_unittest.cc b/app/sql/connection_unittest.cc
index a36fca7..5cd55a7 100644
--- a/app/sql/connection_unittest.cc
+++ b/app/sql/connection_unittest.cc
@@ -8,7 +8,7 @@
#include "base/file_util.h"
#include "base/path_service.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/sqlite/preprocessed/sqlite3.h"
+#include "third_party/sqlite/sqlite3.h"
class SQLConnectionTest : public testing::Test {
public:
diff --git a/app/sql/statement.cc b/app/sql/statement.cc
index 639b02d..07be3d3 100644
--- a/app/sql/statement.cc
+++ b/app/sql/statement.cc
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/utf_string_conversions.h"
-#include "third_party/sqlite/preprocessed/sqlite3.h"
+#include "third_party/sqlite/sqlite3.h"
namespace sql {
diff --git a/app/sql/statement_unittest.cc b/app/sql/statement_unittest.cc
index 90f421c..f9271a7 100644
--- a/app/sql/statement_unittest.cc
+++ b/app/sql/statement_unittest.cc
@@ -10,7 +10,7 @@
#include "base/file_util.h"
#include "base/path_service.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/sqlite/preprocessed/sqlite3.h"
+#include "third_party/sqlite/sqlite3.h"
class StatementErrorHandler : public sql::ErrorDelegate {
public:
diff --git a/app/sql/transaction_unittest.cc b/app/sql/transaction_unittest.cc
index 55b77b9..9ca6bbd 100644
--- a/app/sql/transaction_unittest.cc
+++ b/app/sql/transaction_unittest.cc
@@ -9,7 +9,7 @@
#include "base/file_util.h"
#include "base/path_service.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/sqlite/preprocessed/sqlite3.h"
+#include "third_party/sqlite/sqlite3.h"
class SQLTransactionTest : public testing::Test {
public: