Bug 756156 - Don't export ANDROID_SERIAL if it isn't set explicitly [r=glandium]
authorMatt Brubeck <mbrubeck@mozilla.com>
Thu, 17 May 2012 12:20:42 -0700
changeset 94255 41fff59c307fcd57abeb68b08a42855b31e8502d
parent 94254 d6e2644caa5dbd4286e8de80e106fe8f1d80a417
child 94256 3ce2c136db1ced46f27efa22da10c4d75c75f32b
push id773
push useremorley@mozilla.com
push dateMon, 21 May 2012 06:50:20 +0000
treeherderfx-team@1158503601be [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs756156
milestone15.0a1
Bug 756156 - Don't export ANDROID_SERIAL if it isn't set explicitly [r=glandium]
mobile/android/build.mk
--- a/mobile/android/build.mk
+++ b/mobile/android/build.mk
@@ -74,28 +74,29 @@ package:
 
 fast-package:
 	@$(MAKE) package MOZ_FAST_PACKAGE=1
 
 ifeq ($(OS_TARGET),Android)
 ifneq ($(MOZ_ANDROID_INSTALL_TARGET),)
 ANDROID_SERIAL = $(MOZ_ANDROID_INSTALL_TARGET)
 endif
-ifeq ($(ANDROID_SERIAL),)
+ifneq ($(ANDROID_SERIAL),)
+export ANDROID_SERIAL
+else
 # Determine if there's more than one device connected
 android_devices=$(filter device,$(shell $(ANDROID_PLATFORM_TOOLS)/adb devices))
 ifneq ($(android_devices),device)
 install::
 	@echo "Multiple devices are connected. Define ANDROID_SERIAL to specify the install target."
 	$(ANDROID_PLATFORM_TOOLS)/adb devices
 	@exit 1
 endif
 endif
 
-export ANDROID_SERIAL
 install::
 	$(ANDROID_PLATFORM_TOOLS)/adb install -r $(DIST)/$(PKG_PATH)$(PKG_BASENAME).apk
 else
 	@echo "Mobile can't be installed directly."
 	@exit 1
 endif
 
 deb: package