Bug 1478331 - Include common-opt mozconfig from nightly-asan-reporter instead of duplicating much of it. r=dmajor

Differential Revision: https://phabricator.services.mozilla.com/D43440

--HG--
extra : moz-landing-system : lando

browser/config/mozconfigs/linux64/nightly-asan-reporter

@@ -1,12 +1,8 @@
+. "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
+
 # We still need to build with debug symbols
 ac_add_options --disable-debug
 ac_add_options --enable-optimize="-O2 -gline-tables-only"
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-google-location-service-api-keyfile=/builds/gls-gapi.data
-ac_add_options --with-google-safebrowsing-api-keyfile=/builds/sb-gapi.data
-ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
-
-. $topsrcdir/build/mozconfig.stylo
 
 # ASan specific options on Linux
 ac_add_options --enable-valgrind
@@ -19,9 +15,6 @@ ac_add_options --enable-address-sanitizer-reporter
 # Need this to prevent name conflicts with the normal nightly build packages
 export MOZ_PKG_SPECIAL=asan-reporter
 
-# Need this to add source information into platform.ini
-export MOZILLA_OFFICIAL=1
-
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"

browser/config/mozconfigs/win64/nightly-asan-reporter

@@ -1,26 +1,16 @@
 MOZ_AUTOMATION_L10N_CHECK=0
 
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-google-location-service-api-keyfile=${WORKSPACE}/gls-gapi.data
-ac_add_options --with-google-safebrowsing-api-keyfile=${WORKSPACE}/sb-gapi.data
-ac_add_options --with-mozilla-api-keyfile=${WORKSPACE}/mozilla-desktop-geoloc-api.key
-
 . "$topsrcdir/build/mozconfig.win-common"
-. "$topsrcdir/browser/config/mozconfigs/common"
+. "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
 
 ac_add_options --disable-debug
 ac_add_options --enable-optimize="-O2 -gline-tables-only"
 ac_add_options --enable-address-sanitizer-reporter
 
-. "$topsrcdir/build/win64/mozconfig.vs-latest"
-
 . "$topsrcdir/build/win64/mozconfig.asan"
 
 export MOZ_PKG_SPECIAL=asan-reporter
 
-# Need this to add source information into platform.ini
-export MOZILLA_OFFICIAL=1
-
 ac_add_options --with-branding=browser/branding/nightly
 
 # Sandboxing is currently not compatible with the way the ASan reporter works