Snap for 6941968 from 4407735953d4f981931168f0136784e7ee99103f to android11-tests-release
Change-Id: Iade6e39f5f8e45d74650dee60546ceb530f26e49
diff --git a/tests/bpf_base_test.cpp b/tests/bpf_base_test.cpp
index f28c5f8..3d3da44 100644
--- a/tests/bpf_base_test.cpp
+++ b/tests/bpf_base_test.cpp
@@ -59,15 +59,7 @@
SKIP_IF_BPF_NOT_SUPPORTED;
std::string cg2_path;
-#if 0
- // This is the correct way to fetch cg2_path, but it occasionally hits ASAN
- // problems due to memory allocated in non ASAN code being freed later by us
ASSERT_EQ(true, CgroupGetControllerPath(CGROUPV2_CONTROLLER_NAME, &cg2_path));
-#else
- ASSERT_EQ(true, CgroupGetControllerPath(CGROUPV2_CONTROLLER_NAME, nullptr));
- // Constant derived from //system/core/libprocessgroup/profiles/cgroups.json
- cg2_path = "/dev/cg2_bpf";
-#endif
ASSERT_EQ(0, access(cg2_path.c_str(), R_OK));
ASSERT_EQ(0, access((cg2_path + "/cgroup.controllers").c_str(), R_OK));
}