diff --git a/mobile/android/config/mozconfigs/android-armv6/debug b/mobile/android/config/mozconfigs/android-armv6/debug index d12099a08b82..b167e8469d85 100644 --- a/mobile/android/config/mozconfigs/android-armv6/debug +++ b/mobile/android/config/mozconfigs/android-armv6/debug @@ -30,3 +30,5 @@ ac_add_options --enable-warnings-as-errors # Use ccache ac_add_options --with-ccache=/usr/bin/ccache + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-armv6/l10n-nightly b/mobile/android/config/mozconfigs/android-armv6/l10n-nightly index 45114343d8db..3ee1d89caecd 100644 --- a/mobile/android/config/mozconfigs/android-armv6/l10n-nightly +++ b/mobile/android/config/mozconfigs/android-armv6/l10n-nightly @@ -28,3 +28,5 @@ export MOZILLA_OFFICIAL=1 export MOZ_PKG_SPECIAL=armv6 ac_add_options --with-branding=mobile/android/branding/nightly + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-armv6/l10n-release b/mobile/android/config/mozconfigs/android-armv6/l10n-release index 8eb5d6dd5ad0..218e320c1386 100644 --- a/mobile/android/config/mozconfigs/android-armv6/l10n-release +++ b/mobile/android/config/mozconfigs/android-armv6/l10n-release @@ -26,3 +26,5 @@ export MOZ_PKG_SPECIAL=armv6 ac_add_options --enable-official-branding ac_add_options --with-branding=mobile/android/branding/beta + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-armv6/nightly b/mobile/android/config/mozconfigs/android-armv6/nightly index fa2c8c91a104..91b4d37e7f0e 100644 --- a/mobile/android/config/mozconfigs/android-armv6/nightly +++ b/mobile/android/config/mozconfigs/android-armv6/nightly @@ -28,3 +28,5 @@ ac_add_options --enable-warnings-as-errors # Use ccache ac_add_options --with-ccache=/usr/bin/ccache + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-armv6/release b/mobile/android/config/mozconfigs/android-armv6/release index 871f195f95f2..0587d54478be 100644 --- a/mobile/android/config/mozconfigs/android-armv6/release +++ b/mobile/android/config/mozconfigs/android-armv6/release @@ -24,3 +24,5 @@ export MOZ_PKG_SPECIAL=armv6 ac_add_options --enable-official-branding ac_add_options --with-branding=mobile/android/branding/beta + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-noion/nightly b/mobile/android/config/mozconfigs/android-noion/nightly index af702f52b42b..c12bf30f6902 100644 --- a/mobile/android/config/mozconfigs/android-noion/nightly +++ b/mobile/android/config/mozconfigs/android-noion/nightly @@ -30,3 +30,5 @@ ac_add_options --with-ccache=/usr/bin/ccache # This will overwrite the default of stripping everything and keep the symbol table. # This is useful for profiling with eideticker. See bug 788680 STRIP_FLAGS="--strip-debug" + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86/debug b/mobile/android/config/mozconfigs/android-x86/debug index 8c9de9588da9..48905a159ca1 100644 --- a/mobile/android/config/mozconfigs/android-x86/debug +++ b/mobile/android/config/mozconfigs/android-x86/debug @@ -25,3 +25,5 @@ ac_add_options --enable-warnings-as-errors # Use ccache ac_add_options --with-ccache=/usr/bin/ccache + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86/l10n-nightly b/mobile/android/config/mozconfigs/android-x86/l10n-nightly index e8c73da2a8bf..a52a691c31db 100644 --- a/mobile/android/config/mozconfigs/android-x86/l10n-nightly +++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly @@ -26,3 +26,5 @@ export JAVA_HOME=/tools/jdk6 export MOZILLA_OFFICIAL=1 ac_add_options --with-branding=mobile/android/branding/nightly + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86/l10n-release b/mobile/android/config/mozconfigs/android-x86/l10n-release index f85f7505ca02..05e4eeae13fc 100644 --- a/mobile/android/config/mozconfigs/android-x86/l10n-release +++ b/mobile/android/config/mozconfigs/android-x86/l10n-release @@ -24,3 +24,5 @@ export MOZILLA_OFFICIAL=1 ac_add_options --enable-official-branding ac_add_options --with-branding=mobile/android/branding/beta + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86/nightly b/mobile/android/config/mozconfigs/android-x86/nightly index c05ae70e1d38..b6e91671e4c4 100644 --- a/mobile/android/config/mozconfigs/android-x86/nightly +++ b/mobile/android/config/mozconfigs/android-x86/nightly @@ -23,3 +23,5 @@ ac_add_options --enable-warnings-as-errors # Use ccache ac_add_options --with-ccache=/usr/bin/ccache + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android-x86/release b/mobile/android/config/mozconfigs/android-x86/release index 177db0de86d5..0739377b9724 100644 --- a/mobile/android/config/mozconfigs/android-x86/release +++ b/mobile/android/config/mozconfigs/android-x86/release @@ -19,3 +19,5 @@ export MOZ_TELEMETRY_REPORTING=1 ac_add_options --enable-official-branding ac_add_options --with-branding=mobile/android/branding/beta + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android/debug b/mobile/android/config/mozconfigs/android/debug index 91261037f263..29593209d9cd 100644 --- a/mobile/android/config/mozconfigs/android/debug +++ b/mobile/android/config/mozconfigs/android/debug @@ -25,3 +25,5 @@ ac_add_options --enable-warnings-as-errors # Use ccache ac_add_options --with-ccache=/usr/bin/ccache + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android/l10n-nightly b/mobile/android/config/mozconfigs/android/l10n-nightly index da15900b421c..12b2722c5d13 100644 --- a/mobile/android/config/mozconfigs/android/l10n-nightly +++ b/mobile/android/config/mozconfigs/android/l10n-nightly @@ -26,3 +26,5 @@ export JAVA_HOME=/tools/jdk6 export MOZILLA_OFFICIAL=1 ac_add_options --with-branding=mobile/android/branding/nightly + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android/l10n-release b/mobile/android/config/mozconfigs/android/l10n-release index 65a2b491fdd2..18ac37ab1db4 100644 --- a/mobile/android/config/mozconfigs/android/l10n-release +++ b/mobile/android/config/mozconfigs/android/l10n-release @@ -24,3 +24,5 @@ export MOZILLA_OFFICIAL=1 ac_add_options --enable-official-branding ac_add_options --with-branding=mobile/android/branding/beta + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android/nightly b/mobile/android/config/mozconfigs/android/nightly index 8a0a063a2b18..adced2ff9e9b 100644 --- a/mobile/android/config/mozconfigs/android/nightly +++ b/mobile/android/config/mozconfigs/android/nightly @@ -27,3 +27,5 @@ ac_add_options --with-ccache=/usr/bin/ccache # This will overwrite the default of stripping everything and keep the symbol table. # This is useful for profiling with eideticker. See bug 788680 STRIP_FLAGS="--strip-debug" + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android/release b/mobile/android/config/mozconfigs/android/release index a07e645e5325..6533b7f908df 100644 --- a/mobile/android/config/mozconfigs/android/release +++ b/mobile/android/config/mozconfigs/android/release @@ -19,3 +19,5 @@ export MOZ_TELEMETRY_REPORTING=1 ac_add_options --enable-official-branding ac_add_options --with-branding=mobile/android/branding/beta + +. "$topsrcdir/mobile/android/config/mozconfigs/common.override"