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@59717 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 9 insertions, 9 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/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index 176d519..d4d581f 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -63,6 +63,12 @@
             # ext, preprocessed, and src, with the exception of src/lempar.c,
             # src/shell*, and src/test*.  Exclusions are applied below in the
             # sources/ and sources! sections.
+            'preprocessed/keywordhash.h',
+            'preprocessed/opcodes.c',
+            'preprocessed/opcodes.h',
+            'preprocessed/parse.c',
+            'preprocessed/parse.h',
+            'preprocessed/sqlite3.h',
             'src/ext/async/sqlite3async.c',
             'src/ext/async/sqlite3async.h',
             'src/ext/fts1/ft_hash.c',
@@ -102,12 +108,6 @@
             'src/ext/icu/sqliteicu.h',
             'src/ext/rtree/rtree.c',
             'src/ext/rtree/rtree.h',
-            'src/preprocessed/keywordhash.h',
-            'src/preprocessed/opcodes.c',
-            'src/preprocessed/opcodes.h',
-            'src/preprocessed/parse.c',
-            'src/preprocessed/parse.h',
-            'src/preprocessed/sqlite3.h',
             'src/src/alter.c',
             'src/src/analyze.c',
             'src/src/attach.c',
@@ -200,8 +200,8 @@
             'src/src/tclsqlite.c',
           ],
           'include_dirs': [
+            'preprocessed',
             'src/ext/icu',
-            'src/preprocessed',
             'src/src',
           ],
           'dependencies': [
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_