diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /application/basilisk/config/mozconfigs/win32/common-opt | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-fc61780b35af913801d72086456f493f63197da6.tar UXP-fc61780b35af913801d72086456f493f63197da6.tar.gz UXP-fc61780b35af913801d72086456f493f63197da6.tar.lz UXP-fc61780b35af913801d72086456f493f63197da6.tar.xz UXP-fc61780b35af913801d72086456f493f63197da6.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'application/basilisk/config/mozconfigs/win32/common-opt')
| -rw-r--r-- | application/basilisk/config/mozconfigs/win32/common-opt | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/application/basilisk/config/mozconfigs/win32/common-opt b/application/basilisk/config/mozconfigs/win32/common-opt new file mode 100644 index 000000000..816c8926a --- /dev/null +++ b/application/basilisk/config/mozconfigs/win32/common-opt @@ -0,0 +1,25 @@ +# This file is sourced by the nightly, beta, and release mozconfigs. + +. "$topsrcdir/browser/config/mozconfigs/common" + +ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} +ac_add_options --enable-jemalloc + +if [ -f /c/builds/gapi.data ]; then + _gapi_keyfile=c:/builds/gapi.data +else + _gapi_keyfile=e:/builds/gapi.data +fi +ac_add_options --with-google-api-keyfile=${_gapi_keyfile} + +ac_add_options --with-mozilla-api-keyfile=c:/builds/mozilla-desktop-geoloc-api.key + +# Needed to enable breakpad in application.ini +export MOZILLA_OFFICIAL=1 + +export MOZ_TELEMETRY_REPORTING=1 + +. $topsrcdir/build/win32/mozconfig.vs-latest + +# Package js shell. +export MOZ_PACKAGE_JSSHELL=1 |