system/corennnnn
Revision | 46f208e40d226b881736036088317c918cc5d5e7 (tree) |
---|---|
Zeit | 2009-05-09 01:07:09 |
Autor | Android (Google) Code Review <android-gerrit@goog...> |
Commiter | Android (Google) Code Review |
Merge change 1171
* changes:
@@ -96,7 +96,8 @@ void help() | ||
96 | 96 | " -e - directs command to the only running emulator.\n" |
97 | 97 | " returns an error if more than one emulator is running.\n" |
98 | 98 | " -s <serial number> - directs command to the USB device or emulator with\n" |
99 | - " the given serial number\n" | |
99 | + " the given serial number. Overrides ANDROID_SERIAL\n" | |
100 | + " envivornment variable.\n" | |
100 | 101 | " -p <product name or path> - simple product name like 'sooner', or\n" |
101 | 102 | " a relative/absolute path to a product\n" |
102 | 103 | " out directory like 'out/target/product/sooner'.\n" |
@@ -766,6 +767,8 @@ int adb_commandline(int argc, char **argv) | ||
766 | 767 | } |
767 | 768 | // TODO: also try TARGET_PRODUCT/TARGET_DEVICE as a hint |
768 | 769 | |
770 | + serial = getenv("ANDROID_SERIAL"); | |
771 | + | |
769 | 772 | /* modifiers and flags */ |
770 | 773 | while(argc > 0) { |
771 | 774 | if(!strcmp(argv[0],"nodaemon")) { |