diff options
| author | Nick Pelly <npelly@google.com> | 2009-05-07 12:48:03 -0700 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2009-08-26 14:46:18 -0700 |
| commit | 22048ef3257719a4e03e6a81a989b071abe7655c (patch) | |
| tree | 476991f36d72130d96f27dc1367fd98a020c40c0 | |
| parent | 1e070846f8908dff15086efa12fbba01ab7eae15 (diff) | |
| download | system_core-22048ef3257719a4e03e6a81a989b071abe7655c.tar.gz system_core-22048ef3257719a4e03e6a81a989b071abe7655c.tar.bz2 system_core-22048ef3257719a4e03e6a81a989b071abe7655c.zip | |
Allow adb to use ANDORID_SERIAL env variable to specify the device to talk to.
Overridden by -s.
| -rw-r--r-- | adb/commandline.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/adb/commandline.c b/adb/commandline.c index 548d3624..ad1021ca 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 <serial number> - 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 <product name or path> - 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")) { |