Issue #1457 - Unfold sqlite3 from nss

5 files changed, 5 insertions, 29 deletions

diff --git a/config/external/moz.build b/config/external/moz.build
index 321ca3a5b5..f4013c18a0 100644
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -6,10 +6,8 @@
 
 external_dirs = []
 
-DIRS += [
-    'lgpllibs',
-    'sqlite',
-]
+DIRS += ['lgpllibs']
+
 if not CONFIG['MOZ_SYSTEM_JPEG']:
     external_dirs += ['media/libjpeg']
 
diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in
index ddf956040c..7289e57f4c 100644
--- a/config/external/nss/Makefile.in
+++ b/config/external/nss/Makefile.in
@@ -119,12 +119,8 @@ DEFAULT_GMAKE_FLAGS += NSS_ENABLE_TLS_1_3=1
 ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_1)
 DEFAULT_GMAKE_FLAGS += OS_DLLFLAGS='-static-libgcc' NSPR31_LIB_PREFIX=lib
 endif
-ifdef MOZ_FOLD_LIBS
-DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=nss3
-else
 DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=mozsqlite3
-DEFAULT_GMAKE_FLAGS += SQLITE_LIB_DIR=$(ABS_DIST)/../config/external/sqlite
-endif # MOZ_FOLD_LIBS
+DEFAULT_GMAKE_FLAGS += SQLITE_LIB_DIR=$(ABS_DIST)/../db/sqlite3/src
 DEFAULT_GMAKE_FLAGS += SQLITE_INCLUDE_DIR=$(ABS_DIST)/include
 ifdef NSS_DISABLE_DBM 
 DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1
diff --git a/config/external/nss/moz.build b/config/external/nss/moz.build
index dbf19ff509..bf94d7648b 100644
--- a/config/external/nss/moz.build
+++ b/config/external/nss/moz.build
@@ -29,9 +29,10 @@ else:
         '/security/nss/lib/smime/smime3',
         '/security/nss/lib/ssl/ssl3',
         '/security/nss/lib/util/nssutil3',
-        'sqlite',
     ]
 
+USE_LIBS += ['sqlite']
+
 # XXX: We should fix these warnings.
 ALLOW_COMPILER_WARNINGS = True
 
diff --git a/config/external/nss/nss.symbols b/config/external/nss/nss.symbols
index c46f86dea1..705af4a94a 100644
--- a/config/external/nss/nss.symbols
+++ b/config/external/nss/nss.symbols
@@ -13,7 +13,6 @@
 PR_*
 PL_*
 #endif
-#include ../../../db/sqlite3/src/sqlite.symbols
 ATOB_AsciiToData
 ATOB_AsciiToData_Util
 ATOB_ConvertAsciiToItem
diff --git a/config/external/sqlite/moz.build b/config/external/sqlite/moz.build
deleted file mode 100644
index 31f8e34382..0000000000
--- a/config/external/sqlite/moz.build
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-DIRS += ['../../../db/sqlite3/src']
-if CONFIG['MOZ_FOLD_LIBS']:
-    Library('sqlite')
-    # When folding libraries, sqlite is actually in the nss library.
-    USE_LIBS += [
-        'nss',
-    ]
-else:
-    SharedLibrary('sqlite')
-    SHARED_LIBRARY_NAME = 'mozsqlite3'
-
-    SYMBOLS_FILE = '/db/sqlite3/src/sqlite.symbols'