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

Commit 6a3b225b authored by Greg Kaiser's avatar Greg Kaiser Committed by Automerger Merge Worker
Browse files

Merge "compile_multilib: both for libbinder RPC tests" into main am: 4b22c741 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3191472



Change-Id: I4ce6a028c4b763a674b9f53a2a9af9772391d825
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a25b3198 4b22c741

libs/binder/tests/Android.bp

+10 −1
Original line number Diff line number Diff line
@@ -235,6 +235,16 @@ cc_defaults { 
        "binder_test_defaults",

    ],



    compile_multilib: "both",

    multilib: {

        lib32: {

            suffix: "32",

        },

        lib64: {

            suffix: "64",

        },

    },



    static_libs: [

        "libbinder_test_utils",

        "libbinder_tls_static",
@@ -267,7 +277,6 @@ cc_defaults { 
    defaults: [

        "binderRpcTest_common_defaults",

    ],

    compile_multilib: "first",



    srcs: [

        "binderRpcTest.cpp",

libs/binder/tests/binderRpcTest.cpp

+8 −1
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ 
#include <aidl/IBinderRpcTest.h>

#endif



#if defined(__LP64__)

#define TEST_FILE_SUFFIX "64"

#else

#define TEST_FILE_SUFFIX "32"

#endif



#include <chrono>

#include <cstdlib>

#include <iostream>
@@ -259,7 +265,8 @@ std::unique_ptr<ProcessSession> BinderRpc::createRpcTestSocketServerProcessEtc( 


    std::string path = GetExecutableDirectory();

    auto servicePath = path + "/binder_rpc_test_service" +

            (singleThreaded ? "_single_threaded" : "") + (noKernel ? "_no_kernel" : "");

            (singleThreaded ? "_single_threaded" : "") + (noKernel ? "_no_kernel" : "") +

            TEST_FILE_SUFFIX;



    unique_fd bootstrapClientFd, socketFd;