diff --git a/.gitmodules b/.gitmodules index ddfaeb190a0..f5a77314386 100644 --- a/.gitmodules +++ b/.gitmodules @@ -73,12 +73,6 @@ [submodule "src/support/alert/rust-alert"] path = src/support/alert/rust-alert url = https://github.com/mozilla-servo/rust-alert.git -[submodule "src/support/nss/nss"] - path = src/support/nss/nss - url = https://github.com/mozilla-servo/nss.git -[submodule "src/support/nss/nspr"] - path = src/support/nss/nspr - url = https://github.com/mozilla-servo/nspr.git [submodule "src/support/glfw/glfw"] path = src/support/glfw/glfw url = https://github.com/mozilla-servo/glfw.git diff --git a/configure b/configure index a460952b47a..576f02c953d 100755 --- a/configure +++ b/configure @@ -493,8 +493,6 @@ CFG_SUBMODULES="\ support/hubbub/libhubbub \ support/hubbub/rust-hubbub \ support/libparserutils/libparserutils \ - support/nss/nspr \ - support/nss/nss \ support/skia/skia \ support/spidermonkey/mozjs \ support/spidermonkey/rust-mozjs \ @@ -653,23 +651,6 @@ do ENABLE_DEBUG="$CFG_ENABLE_DEBUG" case $i in - support/nss/nspr) - if [ ${CFG_OSTYPE} = "linux-androideabi" ]; then - CONFIGURE_ARGS="${CONFIGURE_ARGS} --target=arm-linux-androideabi" - CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-android-ndk=${CFG_ANDROID_NDK_PATH}" - CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-android-toolchain=${CFG_ANDROID_CROSS_PATH}" - else - CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-64bit" - fi - ;; - support/nss/nss) - if [ ${CFG_OSTYPE} = "linux-androideabi" ]; then - CONFIGURE_ARGS="${CONFIGURE_ARGS} --host=arm-linux-androideabi" - CONFIGURE_ARGS="${CONFIGURE_ARGS} --android-toolchain=${CFG_ANDROID_CROSS_PATH}" - CONFIGURE_ARGS="${CONFIGURE_ARGS} --android-api-version=14" - fi - CONFIGURE_ARGS="${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS}" - ;; platform/android/libexpat) CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/expat/configure" CONFIGURE_ARGS="${CONFIGURE_ARGS} --host=arm-linux-androideabi" diff --git a/mk/sub.mk b/mk/sub.mk index 361dd465a15..1bcbdfab566 100644 --- a/mk/sub.mk +++ b/mk/sub.mk @@ -7,8 +7,6 @@ SLOW_TESTS += \ # Tests for these submodules do not exist. NO_TESTS += \ - nspr \ - nss \ $(NULL) # These submodules will not be cleaned by the `make clean-fast` target. @@ -25,8 +23,6 @@ NATIVE_BUILDS += \ libparserutils \ mozjs \ skia \ - nss \ - nspr \ glfw \ $(NULL) @@ -147,10 +143,6 @@ DEPS_rust-layers += \ endif -DEPS_nss += \ - nspr \ - $(NULL) - ifeq ($(CFG_OSTYPE),unknown-linux-gnu) DEPS_rust-azure += \ diff --git a/src/support/nss/nspr b/src/support/nss/nspr deleted file mode 160000 index 8219c5c5137..00000000000 --- a/src/support/nss/nspr +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8219c5c5137b94ae93cfb4afc1dc10a94384e1c6 diff --git a/src/support/nss/nss b/src/support/nss/nss deleted file mode 160000 index 949eb9848f4..00000000000 --- a/src/support/nss/nss +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 949eb9848f4fa5f83756f3ab7fdf9b0d3f20d37f