diff options
| author | Thomas Groman <tgroman@nuegia.net> | 2020-06-15 23:59:47 -0700 |
|---|---|---|
| committer | Thomas Groman <tgroman@nuegia.net> | 2020-06-15 23:59:47 -0700 |
| commit | 8f429e0dafc8bdb0a731497a5def1751c7bc7301 (patch) | |
| tree | 398d099793c12402a0c7845ef08f987e327964e5 /storage | |
| parent | 0af0100030be9f2569d3dbf5ab746c2b97c009d0 (diff) | |
| download | UXP-8f429e0dafc8bdb0a731497a5def1751c7bc7301.tar UXP-8f429e0dafc8bdb0a731497a5def1751c7bc7301.tar.gz UXP-8f429e0dafc8bdb0a731497a5def1751c7bc7301.tar.lz UXP-8f429e0dafc8bdb0a731497a5def1751c7bc7301.tar.xz UXP-8f429e0dafc8bdb0a731497a5def1751c7bc7301.zip | |
Revert "Issue #1342 - Remove support for system sqlite"
This reverts commit d41ba28f5257f7c1425a0bde210e69fc5bb34a37.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/SQLiteMutex.h | 2 | ||||
| -rw-r--r-- | storage/moz.build | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/storage/SQLiteMutex.h b/storage/SQLiteMutex.h index eaa69eab1..a38525fd6 100644 --- a/storage/SQLiteMutex.h +++ b/storage/SQLiteMutex.h @@ -50,7 +50,7 @@ public: mMutex = aMutex; } -#if !defined(DEBUG) +#if !defined(DEBUG) || defined(MOZ_SYSTEM_SQLITE) /** * Acquires the mutex. */ diff --git a/storage/moz.build b/storage/moz.build index 2d30a85ec..5ccfabd71 100644 --- a/storage/moz.build +++ b/storage/moz.build @@ -100,6 +100,10 @@ if CONFIG['MOZ_MEMORY']: DEFINES['SQLITE_MAX_LIKE_PATTERN_LENGTH'] = 50000 # See Sqlite moz.build for reasoning about TEMP_STORE. +# For system sqlite we cannot use the compile time option, so we use a pragma. +if CONFIG['MOZ_SYSTEM_SQLITE'] and (CONFIG['OS_TARGET'] == 'Android' + or CONFIG['HAVE_64BIT_BUILD']): + DEFINES['MOZ_MEMORY_TEMP_STORE_PRAGMA'] = True LOCAL_INCLUDES += [ '/db/sqlite3/src', |