From db4492640313be9d3fd65ee5bd7648a9570411bb Mon Sep 17 00:00:00 2001 From: Nick Pelly Date: Thu, 7 May 2009 12:48:03 -0700 Subject: [PATCH] Allow adb to use ANDORID_SERIAL env variable to specify the device to talk to. Overridden by -s. --- adb/commandline.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adb/commandline.c b/adb/commandline.c index 7410dce57..41b340abc 100644 --- a/adb/commandline.c +++ b/adb/commandline.c @@ -96,7 +96,8 @@ void help() " -e - directs command to the only running emulator.\n" " returns an error if more than one emulator is running.\n" " -s - directs command to the USB device or emulator with\n" - " the given serial number\n" + " the given serial number. Overrides ANDROID_SERIAL\n" + " envivornment variable.\n" " -p - simple product name like 'sooner', or\n" " a relative/absolute path to a product\n" " out directory like 'out/target/product/sooner'.\n" @@ -766,6 +767,8 @@ int adb_commandline(int argc, char **argv) } // TODO: also try TARGET_PRODUCT/TARGET_DEVICE as a hint + serial = getenv("ANDROID_SERIAL"); + /* modifiers and flags */ while(argc > 0) { if(!strcmp(argv[0],"nodaemon")) {