diff --git a/build/mozconfig.cache b/build/mozconfig.cache index e5e871ffc38f..644aa123ac87 100644 --- a/build/mozconfig.cache +++ b/build/mozconfig.cache @@ -4,6 +4,9 @@ # Setup for build cache +# Avoid duplication if the file happens to be included twice. +if test -z "$bucket"; then + read branch platform master < /dev/null) EOF @@ -62,3 +65,5 @@ else ;; esac fi + +fi diff --git a/mobile/android/config/mozconfigs/android-armv6/debug b/mobile/android/config/mozconfigs/android-armv6/debug index 4a1f0da90a0e..5bdd512b902e 100644 --- a/mobile/android/config/mozconfigs/android-armv6/debug +++ b/mobile/android/config/mozconfigs/android-armv6/debug @@ -17,7 +17,4 @@ ac_add_options --with-branding=mobile/android/branding/nightly # Treat warnings as errors in directories with FAIL_ON_WARNINGS. ac_add_options --enable-warnings-as-errors -# Use ccache -. "$topsrcdir/build/mozconfig.cache" - . "$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 1e9450bd9be7..1f636457131c 100644 --- a/mobile/android/config/mozconfigs/android-x86/debug +++ b/mobile/android/config/mozconfigs/android-x86/debug @@ -15,7 +15,4 @@ ac_add_options --with-branding=mobile/android/branding/nightly # Treat warnings as errors in directories with FAIL_ON_WARNINGS. ac_add_options --enable-warnings-as-errors -# Use ccache -. "$topsrcdir/build/mozconfig.cache" - . "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/config/mozconfigs/android/debug b/mobile/android/config/mozconfigs/android/debug index 8313acd18041..f5d358fefad0 100644 --- a/mobile/android/config/mozconfigs/android/debug +++ b/mobile/android/config/mozconfigs/android/debug @@ -14,7 +14,4 @@ ac_add_options --with-branding=mobile/android/branding/nightly # Treat warnings as errors in directories with FAIL_ON_WARNINGS. ac_add_options --enable-warnings-as-errors -# Use ccache -. "$topsrcdir/build/mozconfig.cache" - . "$topsrcdir/mobile/android/config/mozconfigs/common.override"