From a5179ececb0d736c220dd4cf24e0dec1a581756e Mon Sep 17 00:00:00 2001
From: "T.J. Mercier" <tjmercier@google.com>
Date: Fri, 9 Aug 2024 16:19:35 +0000
Subject: [PATCH] CGROUPV2_CONTROLLER_NAME -> CGROUPV2_HIERARCHY_NAME

CGROUPV2_CONTROLLER_NAME has been deprecated for nearly a year.

Bug: 349105928
Test: m netd_updatable_unit_test
Change-Id: I8f4d65da94c9be1446cf86711c162b4bd49e2b91
---
 netd/BpfBaseTest.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netd/BpfBaseTest.cpp b/netd/BpfBaseTest.cpp
index c979a7bc98..34dfbb4db7 100644
--- a/netd/BpfBaseTest.cpp
+++ b/netd/BpfBaseTest.cpp
@@ -56,7 +56,7 @@ class BpfBasicTest : public NetNativeTestBase {
 
 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));
 }