SQLite Android Bindings: Check-in [a113b9be83]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Cherrypick SQLite commit e41e50fe into this project. Also add -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE in Android.mk.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	a113b9be83987fb8750f20e60fba61296d5fb8b2
User & Date:	dan 2018-09-18 19:41:43

Context

2018-09-18
20:41		Upgrade this project to version 3.25.1. check-in: 2326888d88 user: dan tags: trunk
19:41		Cherrypick SQLite commit e41e50fe into this project. Also add -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE in Android.mk. check-in: a113b9be83 user: dan tags: trunk
19:25		Update this project to 3.25.0. check-in: 5efce2bd32 user: dan tags: trunk

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to sqlite3/src/main/jni/sqlite/Android.mk.

     9      9   LOCAL_CFLAGS += -DHAVE_USLEEP=1
    10     10   
    11     11   # Enable SQLite extensions.
    12     12   LOCAL_CFLAGS += -DSQLITE_ENABLE_FTS5 
    13     13   LOCAL_CFLAGS += -DSQLITE_ENABLE_RTREE
    14     14   LOCAL_CFLAGS += -DSQLITE_ENABLE_JSON1
    15     15   LOCAL_CFLAGS += -DSQLITE_ENABLE_FTS3
           16  +LOCAL_CFLAGS += -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE
    16     17   
    17     18   # This is important - it causes SQLite to use memory for temp files. Since 
    18     19   # Android has no globally writable temp directory, if this is not defined the
    19     20   # application throws an exception when it tries to create a temp file.
    20     21   #
    21     22   LOCAL_CFLAGS += -DSQLITE_TEMP_STORE=3
    22     23

Changes to sqlite3/src/main/jni/sqlite/sqlite3.c.

 32617  32617     { "lstat",         (sqlite3_syscall_ptr)lstat,          0 },
 32618  32618   #else
 32619  32619     { "lstat",         (sqlite3_syscall_ptr)0,              0 },
 32620  32620   #endif
 32621  32621   #define osLstat      ((int(*)(const char*,struct stat*))aSyscall[27].pCurrent)
 32622  32622   
 32623  32623   #if defined(__linux__) && defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
        32624  +# ifdef __ANDROID__
        32625  +  { "ioctl", (sqlite3_syscall_ptr)(int(*)(int, int, ...))ioctl, 0 },
        32626  +# else
 32624  32627     { "ioctl",         (sqlite3_syscall_ptr)ioctl,          0 },
        32628  +# endif
 32625  32629   #else
 32626  32630     { "ioctl",         (sqlite3_syscall_ptr)0,              0 },
 32627  32631   #endif
 32628  32632   #define osIoctl ((int(*)(int,int,...))aSyscall[28].pCurrent)
 32629  32633   
 32630  32634   }; /* End of the overrideable system calls */
 32631  32635