commit d501c07f50cb4baab4fa0162f2daff21da2bdd06
author Maciej Żenczykowski <maze@google.com> Tue Aug 13 00:08:14 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 13 00:08:14 2024 +0000
tree 0f0426484cbc921b8332cb7bb73366cdc2e14177
parent 44fc38a54e02aa607c5912133dd0b92987520d67
parent 5b5662ce35c538946640b2b2162b5751651c469c

Merge "CGROUPV2_CONTROLLER_NAME -> CGROUPV2_HIERARCHY_NAME" into main am: 91d6cf8686 am: 5b5662ce35

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3211650

Change-Id: Idd1a8c9e9d8f5f2f6a5f176f0bee51fe4d43db17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

netd/BpfBaseTest.cpp

diff --git a/netd/BpfBaseTest.cpp b/netd/BpfBaseTest.cpp
index c979a7b..34dfbb4 100644
--- a/netd/BpfBaseTest.cpp
+++ b/netd/BpfBaseTest.cpp
@@ -56,7 +56,7 @@
 
 TEST_F(BpfBasicTest, TestCgroupMounted) {
     std::string cg2_path;
-    ASSERT_EQ(true, CgroupGetControllerPath(CGROUPV2_CONTROLLER_NAME, &cg2_path));
+    ASSERT_EQ(true, CgroupGetControllerPath(CGROUPV2_HIERARCHY_NAME, &cg2_path));
     ASSERT_EQ(0, access(cg2_path.c_str(), R_OK));
     ASSERT_EQ(0, access((cg2_path + "/cgroup.controllers").c_str(), R_OK));
 }