tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Refactorings to match adb_abb to adb_shell code."

Browse source 
am: 463773b733

Change-Id: Ia4724a38e8474bbae94c640ccd9cb3cf7d8f1915
This commit is contained in:
Alex Buynytskyy 2019-07-08 17:19:47 -07:00 committed by android-build-merger
commit 339fcd996a
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
adb/client/commandline.cpp
View file

@ -775,17 +775,16 @@ static int adb_abb(int argc, const char** argv) {
error_exit("abb is not supported by the device");
}
optind = 1; // argv[0] is always "abb", so set `optind` appropriately.
// Defaults.
constexpr char escape_char = '~'; // -e
constexpr bool use_shell_protocol = true;
constexpr auto shell_type_arg = kShellServiceArgRaw;
constexpr bool empty_command = false;
std::string service_string("abb:");
for (auto i = optind; i < argc; ++i) {
service_string.append(argv[i]);
service_string.push_back(ABB_ARG_DELIMETER);
}
std::vector<const char*> args(argv + optind, argv + argc);
std::string service_string = "abb:" + android::base::Join(args, ABB_ARG_DELIMETER);
D("abb -e 0x%x [%*.s]\n", escape_char, static_cast<int>(service_string.size()),
service_string.data());