Bug 1610149 - turn on wasm sandboxing for Mac configs; r=firefox-buil…

…d-system-reviewers,rstewart Depends on D62800 Differential Revision: https://phabricator.services.mozilla.com/D62801 --HG-- extra : moz-landing-system : lando
dothq · Feb 13, 2020 · 51b509b · 51b509b
1 parent 8f585ab
commit 51b509b
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 0 deletions.
diff --git a/browser/config/mozconfigs/macosx64/common-opt b/browser/config/mozconfigs/macosx64/common-opt
@@ -1,6 +1,7 @@
 # This file is sourced by the nightly, beta, and release mozconfigs.
 
 . $topsrcdir/build/macosx/mozconfig.common
+. $topsrcdir/build/mozconfig.wasm-sandboxing
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-google-location-service-api-keyfile=/builds/gls-gapi.data

diff --git a/browser/config/mozconfigs/macosx64/debug b/browser/config/mozconfigs/macosx64/debug
@@ -1,4 +1,5 @@
 . $topsrcdir/build/macosx/mozconfig.common
+. $topsrcdir/build/mozconfig.wasm-sandboxing
 
 ac_add_options --enable-debug
 

diff --git a/browser/config/mozconfigs/macosx64/debug-asan b/browser/config/mozconfigs/macosx64/debug-asan
@@ -14,4 +14,5 @@ export MOZ_PACKAGE_JSSHELL=1
 export MOZ_PKG_SPECIAL=asan
 
 . "$topsrcdir/build/macosx/mozconfig.common"
+. $topsrcdir/build/mozconfig.wasm-sandboxing
 . "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/macosx64/debug-searchfox b/browser/config/mozconfigs/macosx64/debug-searchfox
@@ -4,6 +4,7 @@ MOZ_AUTOMATION_L10N_CHECK=0
 MOZ_AUTOMATION_CHECK=0
 
 . $topsrcdir/build/macosx/mozconfig.common
+. $topsrcdir/build/mozconfig.wasm-sandboxing
 
 ac_add_options --enable-debug
 

diff --git a/browser/config/mozconfigs/macosx64/debug-static-analysis b/browser/config/mozconfigs/macosx64/debug-static-analysis
@@ -3,6 +3,7 @@ MOZ_AUTOMATION_PACKAGE_TESTS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . $topsrcdir/build/macosx/mozconfig.common
+. $topsrcdir/build/mozconfig.wasm-sandboxing
 
 ac_add_options --enable-debug
 

diff --git a/browser/config/mozconfigs/macosx64/nightly-asan b/browser/config/mozconfigs/macosx64/nightly-asan
@@ -13,6 +13,7 @@ export MOZ_PACKAGE_JSSHELL=1
 export MOZ_PKG_SPECIAL=asan
 
 . "$topsrcdir/build/macosx/mozconfig.common"
+. $topsrcdir/build/mozconfig.wasm-sandboxing
 
 # This is disabled by mozconfig.asan and reenabled by mozconfig.common.
 # Ensure it is disabled since it conflicts with ASan.

diff --git a/browser/config/mozconfigs/macosx64/nightly-fuzzing-asan b/browser/config/mozconfigs/macosx64/nightly-fuzzing-asan
@@ -1,3 +1,5 @@
 . "$topsrcdir/browser/config/mozconfigs/macosx64/nightly-asan"
+. $topsrcdir/build/mozconfig.wasm-sandboxing
+
 unset MOZ_LTO
 ac_add_options --enable-fuzzing
diff --git a/browser/config/mozconfigs/macosx64/opt-static-analysis b/browser/config/mozconfigs/macosx64/opt-static-analysis
@@ -3,6 +3,7 @@ MOZ_AUTOMATION_PACKAGE_TESTS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . $topsrcdir/build/macosx/mozconfig.common
+. $topsrcdir/build/mozconfig.wasm-sandboxing
 
 ac_add_options --disable-debug
 ac_add_options --enable-optimize