Backed out 2 changesets (bug 1626174, bug 1625876) for build bustages…

… at LibrarySandboxPreload.cpp and OggDemuxer.cpp. CLOSED TREE

Backed out changeset 40fea0f3ab6c (bug 1626174)
Backed out changeset a3117fce845d (bug 1625876)

browser/config/mozconfigs/linux64/plain-opt

@@ -1,7 +1,7 @@
 export TOOLTOOL_DIR="$topsrcdir"
 export LLVM_CONFIG="${MOZ_FETCHES_DIR}/clang/bin/llvm-config"
 
-export WASM_SANDBOXED_LIBRARIES=graphite,ogg
+export WASM_SANDBOXED_LIBRARIES=graphite
 export LUCETC="${MOZ_FETCHES_DIR}/lucetc/lucetc"
 export WASI_SYSROOT="${MOZ_FETCHES_DIR}/wasi-sysroot/share/wasi-sysroot"
 export WASM_CC="${MOZ_FETCHES_DIR}/clang/bin/clang --target=wasm32-wasi"

browser/installer/package-manifest.in

@@ -108,9 +108,6 @@
 #ifdef MOZ_WASM_SANDBOXING_GRAPHITE
 @BINPATH@/@DLL_PREFIX@graphitewasm@DLL_SUFFIX@
 #endif
-#ifdef MOZ_WASM_SANDBOXING_OGG
-@BINPATH@/@DLL_PREFIX@oggwasm@DLL_SUFFIX@
-#endif
 
 ; We don't have a complete view of which dlls to expect when doing an artifact
 ; build because we haven't run the relevant parts of configure, so we guess

build/mozconfig.no-compile

@@ -41,7 +41,7 @@ unset RANLIB
 unset NASM
 
 # Don't unset this on Linux artifact builds so the artifact builds correctly
-# package any Wasm sandboxed shared libraries.
+# package the graphite shared library.
 if test `uname -s` != Linux; then
   unset WASM_SANDBOXED_LIBRARIES
 fi

build/mozconfig.wasm-sandboxing

@@ -4,7 +4,7 @@ base-toolchains*)
     # Clang versions < 8.0 don't support wasm.
     ;;
 *)
-    export WASM_SANDBOXED_LIBRARIES=graphite,ogg
+    export WASM_SANDBOXED_LIBRARIES=graphite
     export WASM_CC="${MOZ_FETCHES_DIR}/clang/bin/clang --target=wasm32-wasi"
     export WASM_CXX="${MOZ_FETCHES_DIR}/clang/bin/clang++ --target=wasm32-wasi"
     export LUCETC="${MOZ_FETCHES_DIR}/lucetc/lucetc"