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

Commit 0a622e43 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Don't use Android properties outside of Android" into main am: 897ac13a 

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



Change-Id: Ic49df07bd7a4a87d47e869b5ed9db7889ecdac60
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8cc81f3b 897ac13a

libs/binder/tests/binderRpcTest.cpp

+6 −3
Original line number Diff line number Diff line
@@ -1358,7 +1358,11 @@ private: 
};



TEST(BinderRpc, Java) {

#if !defined(__ANDROID__)

    bool expectDebuggable = false;

#if defined(__ANDROID__)

    expectDebuggable = android::base::GetBoolProperty("ro.debuggable", false) &&

            android::base::GetProperty("ro.build.type", "") != "user";

#else

    GTEST_SKIP() << "This test is only run on Android. Though it can technically run on host on"

                    "createRpcDelegateServiceManager() with a device attached, such test belongs "

                    "to binderHostDeviceTest. Hence, just disable this test on host.";
@@ -1386,8 +1390,7 @@ TEST(BinderRpc, Java) { 
    auto keepAlive = sp<BBinder>::make();

    auto setRpcClientDebugStatus = binder->setRpcClientDebug(std::move(socket), keepAlive);



    if (!android::base::GetBoolProperty("ro.debuggable", false) ||

        android::base::GetProperty("ro.build.type", "") == "user") {

    if (!expectDebuggable) {

        ASSERT_EQ(INVALID_OPERATION, setRpcClientDebugStatus)

                << "setRpcClientDebug should return INVALID_OPERATION on non-debuggable or user "

                   "builds, but get "

libs/binder/tests/binderRpcTestCommon.h

+4 −1
Original line number Diff line number Diff line
@@ -36,9 +36,12 @@ 
#include <string>

#include <vector>



#ifdef __ANDROID__

#include <android-base/properties.h>

#endif



#ifndef __TRUSTY__

#include <android-base/file.h>

#include <android-base/properties.h>

#include <android/binder_auto_utils.h>

#include <android/binder_libbinder.h>

#include <binder/ProcessState.h>