Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 132c6628 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Gerrit Code Review
Browse files

Merge "Drop libfmt dependency" into main

parents 3d0aa789 68c4208e

libs/binder/tests/binderRpcTest.cpp

+5 −6
Original line number Diff line number Diff line
@@ -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;

libs/binder/tests/binderRpcTestCommon.h

+1 −2
Original line number Diff line number Diff line
@@ -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 {

libs/binder/tests/format.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 * 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