Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Unified Diff: third_party/sqlite/sqlite.gyp

Issue 901033002: Import SQLite 3.8.7.4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Chromium changes to support SQLite 3.8.7.4. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/sqlite/sqlite.gyp
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index bb18457a34cce499db03b65091b0b162bb2e6085..349c2412c00bf067088188e0b6e0abbd0093d741 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -11,12 +11,31 @@
'defines': [
'SQLITE_CORE',
'SQLITE_ENABLE_FTS3',
+ # New unicode61 tokenizer with built-in tables.
+ 'SQLITE_DISABLE_FTS3_UNICODE',
+ # Chromium currently does not enable fts4, disable extra code.
+ 'SQLITE_DISABLE_FTS4_DEFERRED',
'SQLITE_ENABLE_ICU',
'SQLITE_ENABLE_MEMORY_MANAGEMENT',
'SQLITE_SECURE_DELETE',
+ # Custom flag to tweak pcache pools.
+ # TODO(shess): This shouldn't use faux-SQLite naming.
'SQLITE_SEPARATE_CACHE_POOLS',
+ # TODO(shess): SQLite adds mutexes to protect structures which cross
+ # threads. In theory Chromium should be able to turn this off for a
+ # slight speed boost.
'THREADSAFE',
+ # TODO(shess): Figure out why this is here. Nobody references it
+ # directly.
'_HAS_EXCEPTIONS=0',
+ # NOTE(shess): Some defines can affect the amalgamation. Those should be
+ # added to google_generate_amalgamation.sh, and the amalgamation
+ # re-generated. Usually this involves disabling features which include
+ # keywords or syntax, for instance SQLITE_OMIT_VIRTUALTABLE omits the
+ # virtual table syntax entirely. Missing an item usually results in
+ # syntax working but execution failing. Review:
+ # src/src/parse.py
+ # src/tool/mkkeywordhash.c
],
},
'targets': [

Powered by Google App Engine
This is Rietveld 408576698