Default GAIA_DOMAIN to example.com for all build variants

Change-Id: I48cfa222105284e4064ff528b64e8c919f06f11c

.config

@@ -18,16 +18,13 @@ GAIA_PATH=${ANDROID_BUILD_TOP}/gaia
 GECKO_OBJDIR=${ANDROID_BUILD_TOP}/out/target/product/${DEVICE}/obj/objdir-gecko
 
 
-# If this is not a user/userdebug build redefine GAIA_DOMAIN away from
-# gaiamobile.org to prevent the UI from automatically updating itself,
-# which can be somewhat undesirable while in the middle of a debug session.
+# Default GAIA_DOMAIN away from gaiamobile.org to prevent the UI from
+# automatically updating itself to an unknown version
 #
 # TODO: This GAIA_DOMAIN logic is duplicated in Android.mk.  Fragile.
-if [ "${TARGET_BUILD_VARIANT}" != "userdebug" -a "${TARGET_BUILD_VARIANT}" != "user" ]; then
-  : ${GAIA_DOMAIN:=example.com}
-  # 'export' need to propagate the variable into |flash gaia|
-  export GAIA_DOMAIN
-fi
+: ${GAIA_DOMAIN:=example.com}
+# 'export' need to propagate the variable into |flash gaia|
+export GAIA_DOMAIN
 
 
 flash_fastboot_ext4()

Android.mk

@@ -26,16 +26,13 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-# If this is not a user/userdebug build redefine GAIA_DOMAIN away from
-# gaiamobile.org to prevent the UI from automatically updating itself,
-# which can be somewhat undesirable while in the middle of a debug session.
+# Default GAIA_DOMAIN away from gaiamobile.org to prevent the UI from
+# automatically updating itself to an unknown version
 #
 # TODO: This GAIA_DOMAIN logic is duplicated in .config.  Fragile.
-ifeq (,$(filter userdebug user,$(TARGET_BUILD_VARIANT)))
 GAIA_DOMAIN?=example.com
 # 'export' need to propagate the variable into the Gaia sub-make
 export GAIA_DOMAIN
-endif
 
 
 LOCAL_PATH:= $(call my-dir)