diff options
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/commandline.c | 5 | ||||
| -rw-r--r-- | adb/get_my_path_darwin.c | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/adb/commandline.c b/adb/commandline.c index 548d362..ad1021c 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")) { diff --git a/adb/get_my_path_darwin.c b/adb/get_my_path_darwin.c index 00dfee4..6125cb4 100644 --- a/adb/get_my_path_darwin.c +++ b/adb/get_my_path_darwin.c @@ -14,7 +14,6 @@ * limitations under the License. */ -#include <utils/executablepath.h> #import <Carbon/Carbon.h> #include <unistd.h> |