commit 657c2bcc675930dbc53d3e65a622257aabfb10a0
author Tomasz Wasilczyk <twasilczyk@google.com> Tue Nov 07 06:57:42 2023 -0800
committer Tomasz Wasilczyk <twasilczyk@google.com> Tue Nov 07 11:09:12 2023 -0800
tree c0b457c9024f6b57fa65380d19e285c94feea98f
parent dc0f937ddfb068670a0c8ea3d32d0d0247b641e0

Don't use libbase macros in binderRpcTest

Bug: 302723053
Test: mma
Change-Id: I5c76bc7dbd96c73d7d03a0b12ffc633d10e3f8e6

libs/binder/tests/binderRpcTest.cpp

diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp
index bc34d4c..bbb310a 100644
--- a/libs/binder/tests/binderRpcTest.cpp
+++ b/libs/binder/tests/binderRpcTest.cpp
@@ -35,6 +35,7 @@
 #include <trusty/tipc.h>
 #endif // BINDER_RPC_TO_TRUSTY_TEST
 
+#include "../Utils.h"
 #include "binderRpcTestCommon.h"
 #include "binderRpcTestFixture.h"
 
@@ -1197,7 +1198,7 @@
                     {.fd = serverFd.get(), .events = POLLIN, .revents = 0},
                     {.fd = connectFd.get(), .events = POLLOUT, .revents = 0},
             };
-            ret = TEMP_FAILURE_RETRY(poll(pfd, arraysize(pfd), -1));
+            ret = TEMP_FAILURE_RETRY(poll(pfd, countof(pfd), -1));
             LOG_ALWAYS_FATAL_IF(ret < 0, "Error polling: %s", strerror(errno));
 
             if (pfd[0].revents & POLLIN) {