Merge branch 'redwood' into 28.9-platform

1 files changed, 12 insertions, 23 deletions

diff --git a/db/sqlite3/src/moz.build b/db/sqlite3/src/moz.build
index 1c26db9c4..eba8633b5 100644
--- a/db/sqlite3/src/moz.build
+++ b/db/sqlite3/src/moz.build
@@ -3,25 +3,18 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-NO_VISIBILITY_FLAGS = True
 
-EXPORTS += [
-    'sqlite3.h',
-]
+NO_VISIBILITY_FLAGS = True
 
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
-if CONFIG['MOZ_FOLD_LIBS']:
-    # When folding libraries, sqlite is actually in the nss library.
-    FINAL_LIBRARY = 'nss'
-else:
-    # The final library is in config/external/sqlite
-    FINAL_LIBRARY = 'sqlite'
+GeckoSharedLibrary('sqlite', linkage=None, mozglue='library')
+SHARED_LIBRARY_NAME = 'mozsqlite3'
+SYMBOLS_FILE = 'sqlite.symbols'
 
-SOURCES += [
-    'sqlite3.c',
-]
+EXPORTS += ['sqlite3.h']
+SOURCES += ['sqlite3.c']
 
 # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we
 # don't have to vacuum to make sure the data is not visible in the file.
@@ -34,8 +27,11 @@ SOURCES += [
 # hidden preference.  If that preference is missing or invalid then this value
 # will be used.
 # Note: Be sure to update the configure.in checks when these change!
-for var in ('SQLITE_SECURE_DELETE', 'SQLITE_THREADSAFE', 'SQLITE_CORE',
-            'SQLITE_ENABLE_FTS3', 'SQLITE_ENABLE_UNLOCK_NOTIFY',
+for var in ('SQLITE_SECURE_DELETE',
+            'SQLITE_THREADSAFE',
+            'SQLITE_CORE',
+            'SQLITE_ENABLE_FTS3',
+            'SQLITE_ENABLE_UNLOCK_NOTIFY',
             'SQLITE_ENABLE_DBSTAT_VTAB'):
     DEFINES[var] = 1
 
@@ -67,10 +63,6 @@ if CONFIG['MOZ_DEBUG']:
     DEFINES['SQLITE_DEBUG'] = 1
     DEFINES['SQLITE_ENABLE_API_ARMOR'] = True
 
-if CONFIG['OS_TARGET'] == 'Android':
-    # default to user readable only to fit Android security model
-    DEFINES['SQLITE_DEFAULT_FILE_PERMISSIONS'] = '0600'
-
 # Force using malloc_usable_size when building with jemalloc because _msize
 # causes assertions on Win64. See bug 719579.
 if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['MOZ_MEMORY']:
@@ -86,10 +78,7 @@ DEFINES['SQLITE_OMIT_DECLTYPE'] = True
 # performance and doesn't suffer from a full separate tmp partition.
 # Exclude 32bit platforms due to address space fragmentation issues.
 # System Sqlite is managed through a PRAGMA instead.
-if CONFIG['OS_TARGET'] == 'Android':
-    # On Android there's no tmp partition, so always use a MEMORY temp store.
-    DEFINES['SQLITE_TEMP_STORE'] = 3
-elif CONFIG['HAVE_64BIT_BUILD']:
+if CONFIG['HAVE_64BIT_BUILD']:
     # On 64bit platforms default to a MEMORY temp store for performance.
     DEFINES['SQLITE_TEMP_STORE'] = 2