From a43d59bcbf8647bffb405cc3ce2951e4a4d12985 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 31 Jan 2020 15:40:09 +0100 Subject: Issue #1342 - Remove support for system sqlite --- storage/SQLiteMutex.h | 2 +- storage/moz.build | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'storage') diff --git a/storage/SQLiteMutex.h b/storage/SQLiteMutex.h index a38525fd6..eaa69eab1 100644 --- a/storage/SQLiteMutex.h +++ b/storage/SQLiteMutex.h @@ -50,7 +50,7 @@ public: mMutex = aMutex; } -#if !defined(DEBUG) || defined(MOZ_SYSTEM_SQLITE) +#if !defined(DEBUG) /** * Acquires the mutex. */ diff --git a/storage/moz.build b/storage/moz.build index 5ccfabd71..2d30a85ec 100644 --- a/storage/moz.build +++ b/storage/moz.build @@ -100,10 +100,6 @@ 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', -- cgit v1.2.3