From a9f772730fb493c5c3fa412fc0b91f2e9b8dbe17 Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Thu, 7 Jul 2022 20:36:59 +0000 Subject: Revert^2 "Update ExecUtils to support artd use cases." This reverts commit ff95ad517297384d4a2ea589490019f90d637e17. Reason for revert: Fix available (aosp/2148047) Test: Presubmit Change-Id: I952960949267a7b6e63cd7966a347cb1f3374b85 Merged-In: I375034162cded6fdf09ee4d4cd783a0d3987af49 --- runtime/exec_utils.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'runtime/exec_utils.h') diff --git a/runtime/exec_utils.h b/runtime/exec_utils.h index 7ce0a9c20a..ff90ebdfb3 100644 --- a/runtime/exec_utils.h +++ b/runtime/exec_utils.h @@ -29,13 +29,13 @@ namespace art { // of the runtime (Runtime::Current()) was started. If no instance of the runtime was started, it // will use the current environment settings. -bool Exec(std::vector& arg_vector, /*out*/ std::string* error_msg); -int ExecAndReturnCode(std::vector& arg_vector, /*out*/ std::string* error_msg); +bool Exec(const std::vector& arg_vector, /*out*/ std::string* error_msg); +int ExecAndReturnCode(const std::vector& arg_vector, /*out*/ std::string* error_msg); // Execute the command specified in `argv_vector` in a subprocess with a timeout. // Returns the process exit code on success, -1 otherwise. -int ExecAndReturnCode(std::vector& arg_vector, - time_t timeout_secs, +int ExecAndReturnCode(const std::vector& arg_vector, + int timeout_sec, /*out*/ bool* timed_out, /*out*/ std::string* error_msg); @@ -44,20 +44,21 @@ class ExecUtils { public: virtual ~ExecUtils() = default; - virtual bool Exec(std::vector& arg_vector, /*out*/ std::string* error_msg) const { + virtual bool Exec(const std::vector& arg_vector, + /*out*/ std::string* error_msg) const { return art::Exec(arg_vector, error_msg); } - virtual int ExecAndReturnCode(std::vector& arg_vector, + virtual int ExecAndReturnCode(const std::vector& arg_vector, /*out*/ std::string* error_msg) const { return art::ExecAndReturnCode(arg_vector, error_msg); } - virtual int ExecAndReturnCode(std::vector& arg_vector, - time_t timeout_secs, + virtual int ExecAndReturnCode(const std::vector& arg_vector, + int timeout_sec, /*out*/ bool* timed_out, /*out*/ std::string* error_msg) const { - return art::ExecAndReturnCode(arg_vector, timeout_secs, timed_out, error_msg); + return art::ExecAndReturnCode(arg_vector, timeout_sec, timed_out, error_msg); } }; -- cgit v1.2.3-59-g8ed1b