summaryrefslogtreecommitdiffstats
path: root/third_party/sqlite
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 22:43:58 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-15 22:43:58 +0000
commitba7fb305cb774af0b979f39d127bf7039cba9a32 (patch)
tree2746dc0af67204b94312e992da015c95cbbbb6e5 /third_party/sqlite
parent5686e18f9855098f6b0993549e3243e4d4f7f947 (diff)
downloadchromium_src-ba7fb305cb774af0b979f39d127bf7039cba9a32.zip
chromium_src-ba7fb305cb774af0b979f39d127bf7039cba9a32.tar.gz
chromium_src-ba7fb305cb774af0b979f39d127bf7039cba9a32.tar.bz2
Move sqlite preprocessed directory one level up, it's not from upstream.
This is a follow-up to one of my earlier patches. TEST=none BUG=22208, 50769 Review URL: http://codereview.chromium.org/3301019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/sqlite')
-rwxr-xr-xthird_party/sqlite/google_generate_preprocessed.sh2
-rw-r--r--third_party/sqlite/preprocessed/README (renamed from third_party/sqlite/src/preprocessed/README)0
-rw-r--r--third_party/sqlite/preprocessed/keywordhash.h (renamed from third_party/sqlite/src/preprocessed/keywordhash.h)0
-rw-r--r--third_party/sqlite/preprocessed/opcodes.c (renamed from third_party/sqlite/src/preprocessed/opcodes.c)0
-rw-r--r--third_party/sqlite/preprocessed/opcodes.h (renamed from third_party/sqlite/src/preprocessed/opcodes.h)0
-rw-r--r--third_party/sqlite/preprocessed/parse.c (renamed from third_party/sqlite/src/preprocessed/parse.c)0
-rw-r--r--third_party/sqlite/preprocessed/parse.h (renamed from third_party/sqlite/src/preprocessed/parse.h)0
-rw-r--r--third_party/sqlite/preprocessed/sqlite3.h (renamed from third_party/sqlite/src/preprocessed/sqlite3.h)0
-rw-r--r--third_party/sqlite/sqlite3.h2
9 files changed, 2 insertions, 2 deletions
diff --git a/third_party/sqlite/google_generate_preprocessed.sh b/third_party/sqlite/google_generate_preprocessed.sh
index d204bb3..d1dcfad 100755
--- a/third_party/sqlite/google_generate_preprocessed.sh
+++ b/third_party/sqlite/google_generate_preprocessed.sh
@@ -13,7 +13,7 @@ OPTS=""
# These options should match those in ../../tools/config.mk.
OPTS="$OPTS -DSQLITE_OMIT_LOAD_EXTENSION=1"
make "OPTS=$OPTS" $FILES
-cp -f $FILES ../preprocessed
+cp -f $FILES ../../preprocessed
cd ..
rm -rf bld
diff --git a/third_party/sqlite/src/preprocessed/README b/third_party/sqlite/preprocessed/README
index 302965d..302965d 100644
--- a/third_party/sqlite/src/preprocessed/README
+++ b/third_party/sqlite/preprocessed/README
diff --git a/third_party/sqlite/src/preprocessed/keywordhash.h b/third_party/sqlite/preprocessed/keywordhash.h
index 066f1a6..066f1a6 100644
--- a/third_party/sqlite/src/preprocessed/keywordhash.h
+++ b/third_party/sqlite/preprocessed/keywordhash.h
diff --git a/third_party/sqlite/src/preprocessed/opcodes.c b/third_party/sqlite/preprocessed/opcodes.c
index 706e565..706e565 100644
--- a/third_party/sqlite/src/preprocessed/opcodes.c
+++ b/third_party/sqlite/preprocessed/opcodes.c
diff --git a/third_party/sqlite/src/preprocessed/opcodes.h b/third_party/sqlite/preprocessed/opcodes.h
index 643df41..643df41 100644
--- a/third_party/sqlite/src/preprocessed/opcodes.h
+++ b/third_party/sqlite/preprocessed/opcodes.h
diff --git a/third_party/sqlite/src/preprocessed/parse.c b/third_party/sqlite/preprocessed/parse.c
index 3fe8593..3fe8593 100644
--- a/third_party/sqlite/src/preprocessed/parse.c
+++ b/third_party/sqlite/preprocessed/parse.c
diff --git a/third_party/sqlite/src/preprocessed/parse.h b/third_party/sqlite/preprocessed/parse.h
index a4ed108..a4ed108 100644
--- a/third_party/sqlite/src/preprocessed/parse.h
+++ b/third_party/sqlite/preprocessed/parse.h
diff --git a/third_party/sqlite/src/preprocessed/sqlite3.h b/third_party/sqlite/preprocessed/sqlite3.h
index b9452de..b9452de 100644
--- a/third_party/sqlite/src/preprocessed/sqlite3.h
+++ b/third_party/sqlite/preprocessed/sqlite3.h
diff --git a/third_party/sqlite/sqlite3.h b/third_party/sqlite/sqlite3.h
index 6c7c3b0..812939d 100644
--- a/third_party/sqlite/sqlite3.h
+++ b/third_party/sqlite/sqlite3.h
@@ -16,7 +16,7 @@
// when using system sqlite).
int sqlite3Preload(sqlite3 *db) { return SQLITE_OK; }
#else
-#include "third_party/sqlite/src/preprocessed/sqlite3.h"
+#include "third_party/sqlite/preprocessed/sqlite3.h"
#endif
#endif // THIRD_PARTY_SQLITE_SQLITE3_H_