From 1e5cb8e5a364e4105708235f9c295f6f6224bfc2 Mon Sep 17 00:00:00 2001
From: Ben Hearsum <bhearsum@mozilla.com>
Date: Mon, 9 Feb 2015 10:26:13 -0500
Subject: [PATCH] bug 1121160: Release automation support for split-apk builds
 - add release mozconfigs for split apk builds. r=mfinkle,rnewman

---
 .../mozconfigs/android-api-11/l10n-release    | 25 +++++++++++++++++
 .../config/mozconfigs/android-api-11/release  | 16 +++++++++++
 .../android-api-9-10-constrained/l10n-release | 27 +++++++++++++++++++
 .../android-api-9-10-constrained/release      | 20 ++++++++++++++
 4 files changed, 88 insertions(+)
 create mode 100644 mobile/android/config/mozconfigs/android-api-11/l10n-release
 create mode 100644 mobile/android/config/mozconfigs/android-api-11/release
 create mode 100644 mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-release
 create mode 100644 mobile/android/config/mozconfigs/android-api-9-10-constrained/release

diff --git a/mobile/android/config/mozconfigs/android-api-11/l10n-release b/mobile/android/config/mozconfigs/android-api-11/l10n-release
new file mode 100644
index 000000000000..4f4b957245db
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-api-11/l10n-release
@@ -0,0 +1,25 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# L10n
+ac_add_options --with-l10n-base=..
+
+# Global options
+ac_add_options --disable-tests
+
+# Android
+ac_add_options --with-android-min-sdk=11
+ac_add_options --target=arm-linux-androideabi
+
+ac_add_options --with-system-zlib
+ac_add_options --enable-updater
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+
+export MOZILLA_OFFICIAL=1
+export MOZ_DISABLE_GECKOVIEW=1
+
+ac_add_options --enable-official-branding
+ac_add_options --with-branding=mobile/android/branding/beta
+
+ac_add_options --disable-stdcxx-compat
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-api-11/release b/mobile/android/config/mozconfigs/android-api-11/release
new file mode 100644
index 000000000000..34e8ddf2f87f
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-api-11/release
@@ -0,0 +1,16 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Android
+ac_add_options --with-android-min-sdk=11
+ac_add_options --target=arm-linux-androideabi
+
+ac_add_options --with-branding=mobile/android/branding/beta
+
+ac_add_options --enable-updater
+
+export MOZILLA_OFFICIAL=1
+export MOZ_TELEMETRY_REPORTING=1
+
+ac_add_options --enable-official-branding
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-release b/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-release
new file mode 100644
index 000000000000..61215945e530
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-release
@@ -0,0 +1,27 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# L10n
+ac_add_options --with-l10n-base=..
+
+# Global options
+ac_add_options --disable-tests
+
+# Android
+ac_add_options --with-android-min-sdk=9
+ac_add_options --with-android-max-sdk=10
+ac_add_options --enable-android-resource-constrained
+ac_add_options --target=arm-linux-androideabi
+
+ac_add_options --with-system-zlib
+ac_add_options --enable-updater
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+
+export MOZILLA_OFFICIAL=1
+export MOZ_DISABLE_GECKOVIEW=1
+
+ac_add_options --enable-official-branding
+ac_add_options --with-branding=mobile/android/branding/beta
+
+ac_add_options --disable-stdcxx-compat
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-api-9-10-constrained/release b/mobile/android/config/mozconfigs/android-api-9-10-constrained/release
new file mode 100644
index 000000000000..ea5b5de5197d
--- /dev/null
+++ b/mobile/android/config/mozconfigs/android-api-9-10-constrained/release
@@ -0,0 +1,20 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+# Android
+ac_add_options --with-android-min-sdk=9
+ac_add_options --with-android-max-sdk=10
+ac_add_options --enable-android-resource-constrained
+export MOZ_DISABLE_GECKOVIEW=1
+
+ac_add_options --target=arm-linux-androideabi
+
+ac_add_options --with-branding=mobile/android/branding/beta
+
+ac_add_options --enable-updater
+
+export MOZILLA_OFFICIAL=1
+export MOZ_TELEMETRY_REPORTING=1
+
+ac_add_options --enable-official-branding
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"