Merge change 1171

* changes:
  Allow adb to use ANDORID_SERIAL env variable to specify the device to talk to.
This commit is contained in:
Android (Google) Code Review 2009-05-08 09:07:09 -07:00
commit 46f208e40d

View file

@ -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")) {