From 0e9957c412002000067479e7ce582e8d625e21c0 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Thu, 20 Feb 2020 10:02:49 -0500 Subject: Issue #1457 - Unfold sqlite3 from nss --- db/sqlite3/src/moz.build | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'db') diff --git a/db/sqlite3/src/moz.build b/db/sqlite3/src/moz.build index 1c26db9c43..70a5f456a3 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 -- cgit v1.2.3