libbpf_android doesn't use libnetdutils
Remove libnetdutils dependency because bpf is being used for things other
than networking these days, and we don't want to make libnetdutils
vendor-available in the future. libbase provides an alternative type now.
Bug: 140330870
Test: atest netd_integration_test netd_unit_test libnetdbpf_test
Test: atest bpf_benchmark (fails on unrelated synchronizeKernelRCU)
Change-Id: Iab50cf8113818606cc7d32843e51907ae02543bc
diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp
index 90fd602..0050066 100644
--- a/tests/binder_test.cpp
+++ b/tests/binder_test.cpp
@@ -2853,13 +2853,13 @@
android::bpf::BpfMap<uint32_t, uint8_t> uidPermissionMap(
android::bpf::mapRetrieve(UID_PERMISSION_MAP_PATH, 0));
for (int32_t uid : uids) {
- android::netdutils::StatusOr<uint8_t> permission = uidPermissionMap.readValue(uid);
+ android::base::Result<uint8_t> permission = uidPermissionMap.readValue(uid);
if (exist) {
- EXPECT_TRUE(isOk(permission));
+ ASSERT_TRUE(permission);
EXPECT_EQ(INetd::PERMISSION_NONE, permission.value());
} else {
- EXPECT_FALSE(isOk(permission));
- EXPECT_EQ(ENOENT, permission.status().code());
+ ASSERT_FALSE(permission);
+ EXPECT_EQ(ENOENT, permission.error().code());
}
}
}