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/win64/l10n-mozconfig | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.gz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.lz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.xz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.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/win64/l10n-mozconfig')
| -rw-r--r-- | application/basilisk/config/mozconfigs/win64/l10n-mozconfig | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/application/basilisk/config/mozconfigs/win64/l10n-mozconfig b/application/basilisk/config/mozconfigs/win64/l10n-mozconfig new file mode 100644 index 000000000..3b9b4af1c --- /dev/null +++ b/application/basilisk/config/mozconfigs/win64/l10n-mozconfig @@ -0,0 +1,20 @@ +. "$topsrcdir/browser/config/mozconfigs/common" +. "$topsrcdir/browser/config/mozconfigs/win64/common-win64" + +ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} +ac_add_options --with-l10n-base=../../l10n +ac_add_options --with-windows-version=603 +ac_add_options --enable-official-branding + +export MOZILLA_OFFICIAL=1 + +# Enable Telemetry +export MOZ_TELEMETRY_REPORTING=1 + +# Don't autoclobber l10n, as this can lead to missing binaries and broken builds +# Bug 1283438 +mk_add_options AUTOCLOBBER= + +. $topsrcdir/build/win64/mozconfig.vs-latest + +. "$topsrcdir/build/mozconfig.common.override" |