Permalink
Browse files

Upgrade SQLite to 3.7.10.

Ported all original Android-specific patches.

Change-Id: I2c5801a92d783e2c5cba72147d9fb777ad7c8443
  • Loading branch information...
j9brown committed Jan 20, 2012
1 parent cbfefda commit 90ed05d921d6ed7f12012d9786d53f57fafee51a
Showing with 141,936 additions and 118,141 deletions.
  1. +2 −2 ThirdPartyProject.prop
  2. +11 −6 dist/Android.mk
  3. +332 −77 dist/shell.c
  4. +332 −77 dist/shell.c.orig
  5. +51,706 −41,206 dist/sqlite3.c
  6. +86,854 −76,354 dist/sqlite3.c.orig
  7. +902 −209 dist/sqlite3.h
  8. +902 −209 dist/sqlite3.h.orig
  9. +447 −0 dist/sqlite3ext.h
  10. +447 −0 dist/sqlite3ext.h.orig
  11. +1 −1 dist/version
View
@@ -1,7 +1,7 @@
# Copyright 2010 Google Inc. All Rights Reserved.
#Fri Jul 16 10:03:09 PDT 2010
-currentVersion=3.6.17
-version=3.5.9
+currentVersion=3.7.10
+version=3.7.10
isNative=true
feedurl=http\://www.sqlite.org/changes.html
name=sqlite
View
@@ -10,7 +10,17 @@ LOCAL_PATH:= $(call my-dir)
# SQLITE_TEMP_STORE=3 causes all TEMP files to go into RAM. and thats the behavior we want
# SQLITE_ENABLE_FTS3 enables usage of FTS3 - NOT FTS1 or 2.
# SQLITE_DEFAULT_AUTOVACUUM=1 causes the databases to be subject to auto-vacuum
-common_sqlite_flags := -DHAVE_USLEEP=1 -DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576 -DSQLITE_THREADSAFE=1 -DNDEBUG=1 -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1 -DSQLITE_DEFAULT_AUTOVACUUM=1 -DSQLITE_TEMP_STORE=3 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_BACKWARDS -DSQLITE_DEFAULT_FILE_FORMAT=4
+common_sqlite_flags := \
+ -DNDEBUG=1 \
+ -DHAVE_USLEEP=1 \
+ -DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576 \
+ -DSQLITE_THREADSAFE=1 \
+ -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1 \
+ -DSQLITE_DEFAULT_AUTOVACUUM=1 \
+ -DSQLITE_TEMP_STORE=3 \
+ -DSQLITE_ENABLE_FTS3 \
+ -DSQLITE_ENABLE_FTS3_BACKWARDS \
+ -DSQLITE_DEFAULT_FILE_FORMAT=4
common_src_files := sqlite3.c
@@ -37,11 +47,6 @@ LOCAL_SHARED_LIBRARIES += liblog \
# include android specific methods
LOCAL_WHOLE_STATIC_LIBRARIES := libsqlite3_android
-## Choose only one of the allocator systems below
-# new sqlite 3.5.6 no longer support external allocator
-#LOCAL_SRC_FILES += mem_malloc.c
-#LOCAL_SRC_FILES += mem_mspace.c
-
include $(BUILD_SHARED_LIBRARY)
Oops, something went wrong.

0 comments on commit 90ed05d

Please sign in to comment.