summaryrefslogtreecommitdiffstats
path: root/browser/config/mozconfigs/macosx-universal
diff options
context:
space:
mode:
Diffstat (limited to 'browser/config/mozconfigs/macosx-universal')
-rw-r--r--browser/config/mozconfigs/macosx-universal/beta15
-rw-r--r--browser/config/mozconfigs/macosx-universal/common-opt18
-rw-r--r--browser/config/mozconfigs/macosx-universal/l10n-mozconfig22
-rw-r--r--browser/config/mozconfigs/macosx-universal/nightly21
-rw-r--r--browser/config/mozconfigs/macosx-universal/release21
5 files changed, 0 insertions, 97 deletions
diff --git a/browser/config/mozconfigs/macosx-universal/beta b/browser/config/mozconfigs/macosx-universal/beta
deleted file mode 100644
index 937185e94..000000000
--- a/browser/config/mozconfigs/macosx-universal/beta
+++ /dev/null
@@ -1,15 +0,0 @@
-MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
- MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
- MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-. "$topsrcdir/build/mozconfig.rust"
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx-universal/common-opt b/browser/config/mozconfigs/macosx-universal/common-opt
deleted file mode 100644
index 145d32fc9..000000000
--- a/browser/config/mozconfigs/macosx-universal/common-opt
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is sourced by the nightly, beta, and release mozconfigs.
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-# Universal builds override the default of browser (bug 575283 comment 29)
-ac_add_options --enable-application=browser
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-google-api-keyfile=/builds/gapi.data
-ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
diff --git a/browser/config/mozconfigs/macosx-universal/l10n-mozconfig b/browser/config/mozconfigs/macosx-universal/l10n-mozconfig
deleted file mode 100644
index 80a06ed65..000000000
--- a/browser/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
-. "$topsrcdir/build/macosx/mozconfig.common"
-
-ac_add_options --with-l10n-base=../../l10n
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-official-branding
-
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
-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/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx-universal/nightly b/browser/config/mozconfigs/macosx-universal/nightly
deleted file mode 100644
index 7af737e56..000000000
--- a/browser/config/mozconfigs/macosx-universal/nightly
+++ /dev/null
@@ -1,21 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
-
-ac_add_options --disable-install-strip
-ac_add_options --enable-verify-mar
-
-ac_add_options --enable-instruments
-
-# Cross-universal builds fail when dtrace is enabled
-if test `uname -s` != Linux; then
- ac_add_options --enable-dtrace
-fi
-
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
-ac_add_options --with-branding=browser/branding/nightly
-
-. "$topsrcdir/build/mozconfig.rust"
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/macosx-universal/release b/browser/config/mozconfigs/macosx-universal/release
deleted file mode 100644
index 4700886aa..000000000
--- a/browser/config/mozconfigs/macosx-universal/release
+++ /dev/null
@@ -1,21 +0,0 @@
-# This make file should be identical to the beta mozconfig, apart from the
-# safeguard below
-MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-
-if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
- MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
- MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
-
-. "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
-
-# safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
-# defines.sh during the beta cycle
-export BUILDING_RELEASE=1
-
-. "$topsrcdir/build/mozconfig.rust"
-. "$topsrcdir/build/mozconfig.common.override"
-. "$topsrcdir/build/mozconfig.cache"