diff options
| -rw-r--r-- | libs/binder/tests/binderRpcTest.cpp | 11 | ||||
| -rw-r--r-- | libs/binder/tests/binderRpcTestCommon.h | 3 | ||||
| -rw-r--r-- | libs/binder/tests/format.h | 29 |
3 files changed, 6 insertions, 37 deletions
diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp index f0400d3c0d..c044d3943d 100644 --- a/libs/binder/tests/binderRpcTest.cpp +++ b/libs/binder/tests/binderRpcTest.cpp @@ -64,12 +64,12 @@ constexpr char kTrustyIpcDevice[] = "/dev/trusty-ipc-dev0"; static std::string WaitStatusToString(int wstatus) { if (WIFEXITED(wstatus)) { - return std::format("exit status {}", WEXITSTATUS(wstatus)); + return "exit status " + std::to_string(WEXITSTATUS(wstatus)); } if (WIFSIGNALED(wstatus)) { - return std::format("term signal {}", WTERMSIG(wstatus)); + return "term signal " + std::to_string(WTERMSIG(wstatus)); } - return std::format("unexpected state {}", wstatus); + return "unexpected state " + std::to_string(wstatus); } static void debugBacktrace(pid_t pid) { @@ -263,9 +263,8 @@ std::unique_ptr<ProcessSession> BinderRpc::createRpcTestSocketServerProcessEtc( bool noKernel = GetParam().noKernel; std::string path = GetExecutableDirectory(); - auto servicePath = - std::format("{}/binder_rpc_test_service{}{}", path, - singleThreaded ? "_single_threaded" : "", noKernel ? "_no_kernel" : ""); + auto servicePath = path + "/binder_rpc_test_service" + + (singleThreaded ? "_single_threaded" : "") + (noKernel ? "_no_kernel" : ""); unique_fd bootstrapClientFd, socketFd; diff --git a/libs/binder/tests/binderRpcTestCommon.h b/libs/binder/tests/binderRpcTestCommon.h index dfce4417a0..acc0373bf4 100644 --- a/libs/binder/tests/binderRpcTestCommon.h +++ b/libs/binder/tests/binderRpcTestCommon.h @@ -60,7 +60,6 @@ #include "../FdUtils.h" #include "../RpcState.h" // for debugging #include "FileUtils.h" -#include "format.h" #include "utils/Errors.h" namespace android { @@ -99,7 +98,7 @@ static inline std::vector<uint32_t> testVersions() { } static inline std::string trustyIpcPort(uint32_t serverVersion) { - return std::format("com.android.trusty.binderRpcTestService.V{}", serverVersion); + return "com.android.trusty.binderRpcTestService.V" + std::to_string(serverVersion); } enum class SocketType { diff --git a/libs/binder/tests/format.h b/libs/binder/tests/format.h deleted file mode 100644 index c588de70bd..0000000000 --- a/libs/binder/tests/format.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// TODO(b/302723053): remove this header and replace with <format> once b/175635923 is done -// ETA for this blocker is 2023-10-27~2023-11-10. -// Also, remember to remove fmtlib's format.cc from trusty makefiles. - -#if __has_include(<format>) && !defined(_LIBCPP_HAS_NO_INCOMPLETE_FORMAT) -#include <format> -#else -#include <fmt/format.h> - -namespace std { -using fmt::format; -} -#endif
\ No newline at end of file |