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: |
a113b9be83987fb8750f20e60fba6129 |
| 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
Changes to sqlite3/src/main/jni/sqlite/Android.mk.
| ︙ | ︙ | |||
9 10 11 12 13 14 15 16 17 18 19 20 21 22 | LOCAL_CFLAGS += -DHAVE_USLEEP=1 # Enable SQLite extensions. LOCAL_CFLAGS += -DSQLITE_ENABLE_FTS5 LOCAL_CFLAGS += -DSQLITE_ENABLE_RTREE LOCAL_CFLAGS += -DSQLITE_ENABLE_JSON1 LOCAL_CFLAGS += -DSQLITE_ENABLE_FTS3 # This is important - it causes SQLite to use memory for temp files. Since # Android has no globally writable temp directory, if this is not defined the # application throws an exception when it tries to create a temp file. # LOCAL_CFLAGS += -DSQLITE_TEMP_STORE=3 | > | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | LOCAL_CFLAGS += -DHAVE_USLEEP=1 # Enable SQLite extensions. LOCAL_CFLAGS += -DSQLITE_ENABLE_FTS5 LOCAL_CFLAGS += -DSQLITE_ENABLE_RTREE LOCAL_CFLAGS += -DSQLITE_ENABLE_JSON1 LOCAL_CFLAGS += -DSQLITE_ENABLE_FTS3 LOCAL_CFLAGS += -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE # This is important - it causes SQLite to use memory for temp files. Since # Android has no globally writable temp directory, if this is not defined the # application throws an exception when it tries to create a temp file. # LOCAL_CFLAGS += -DSQLITE_TEMP_STORE=3 |
| ︙ | ︙ |
Changes to sqlite3/src/main/jni/sqlite/sqlite3.c.
| ︙ | ︙ | |||
32617 32618 32619 32620 32621 32622 32623 32624 32625 32626 32627 32628 32629 32630 32631 |
{ "lstat", (sqlite3_syscall_ptr)lstat, 0 },
#else
{ "lstat", (sqlite3_syscall_ptr)0, 0 },
#endif
#define osLstat ((int(*)(const char*,struct stat*))aSyscall[27].pCurrent)
#if defined(__linux__) && defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
{ "ioctl", (sqlite3_syscall_ptr)ioctl, 0 },
#else
{ "ioctl", (sqlite3_syscall_ptr)0, 0 },
#endif
#define osIoctl ((int(*)(int,int,...))aSyscall[28].pCurrent)
}; /* End of the overrideable system calls */
| > > > > | 32617 32618 32619 32620 32621 32622 32623 32624 32625 32626 32627 32628 32629 32630 32631 32632 32633 32634 32635 |
{ "lstat", (sqlite3_syscall_ptr)lstat, 0 },
#else
{ "lstat", (sqlite3_syscall_ptr)0, 0 },
#endif
#define osLstat ((int(*)(const char*,struct stat*))aSyscall[27].pCurrent)
#if defined(__linux__) && defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
# ifdef __ANDROID__
{ "ioctl", (sqlite3_syscall_ptr)(int(*)(int, int, ...))ioctl, 0 },
# else
{ "ioctl", (sqlite3_syscall_ptr)ioctl, 0 },
# endif
#else
{ "ioctl", (sqlite3_syscall_ptr)0, 0 },
#endif
#define osIoctl ((int(*)(int,int,...))aSyscall[28].pCurrent)
}; /* End of the overrideable system calls */
|
| ︙ | ︙ |