wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 756156 - Don't export ANDROID_SERIAL if it isn't set explicitly [r=glandium]

Browse Source
This commit is contained in:
Matt Brubeck 2012-05-17 12:20:42 -07:00
parent 5013c7f815
commit 0c55d38394
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mobile/android/build.mk
View File

@ -79,7 +79,9 @@ 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)
@ -90,7 +92,6 @@ install::
endif
endif
export ANDROID_SERIAL
install::
$(ANDROID_PLATFORM_TOOLS)/adb install -r $(DIST)/$(PKG_PATH)$(PKG_BASENAME).apk
else