openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "adb: print emulator console output"

This commit is contained in:
Bo Hu 2018-10-31 04:28:17 +00:00 committed by Gerrit Code Review
parent e94eb5140c 09faa66006
commit 3e3797a947
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
adb/client/console.cpp
View File

@ -135,6 +135,7 @@ int adb_send_emulator_command(int argc, const char** argv, const char* serial) {
// preventing the emulator from reading the command that adb has sent.
// https://code.google.com/p/android/issues/detail?id=21021
int result;
std::string emulator_output;
do {
char buf[BUFSIZ];
result = adb_read(fd, buf, sizeof(buf));
@ -146,8 +147,37 @@ int adb_send_emulator_command(int argc, const char** argv, const char* serial) {
// appended above, and that causes the emulator to close the socket
// which should cause zero bytes (orderly/graceful shutdown) to be
// returned.
if (result > 0) emulator_output.append(buf, result);
} while (result > 0);
// Note: the following messages are expected to be quite stable from emulator.
//
// Emulator console will send the following message upon connection:
//
// Android Console: Authentication required
// Android Console: type 'auth <auth_token>' to authenticate
// Android Console: you can find your <auth_token> in
// '/<path-to-home>/.emulator_console_auth_token'
// OK\r\n
//
// and the following after authentication:
// Android Console: type 'help' for a list of commands
// OK\r\n
//
// So try search and skip first two "OK\r\n", print the rest.
//
const std::string delims = "OK\r\n";
size_t found = 0;
for (int i = 0; i < 2; ++i) {
const size_t result = emulator_output.find(delims, found);
if (result == std::string::npos) {
break;
} else {
found = result + delims.size();
}
}
printf("%s", emulator_output.c_str() + found);
adb_close(fd);
return 0;