Mount /dev/cpuset instead of /dev/cpuctl.
This mount point was used by ArtExecTest, and the test is being changed
to depending on /dev/cpuset.
Bug: 240930874
Test: art/tools/run-gtests.sh \
/apex/com.android.art/bin/art/arm64/art_libarttools_tests
Change-Id: Ibe9539f8423d418da2b7a5d6185188cf212e5ba5
Merged-In: Ibe9539f8423d418da2b7a5d6185188cf212e5ba5
diff --git a/tools/buildbot-setup-device.sh b/tools/buildbot-setup-device.sh
index d2dd644..1cad3e3 100755
--- a/tools/buildbot-setup-device.sh
+++ b/tools/buildbot-setup-device.sh
@@ -173,8 +173,8 @@
|| adb shell mount -o bind /dev "$ART_TEST_CHROOT/dev"
adb shell mount | grep -q "^devpts on $ART_TEST_CHROOT/dev/pts type devpts " \
|| adb shell mount -o bind /dev/pts "$ART_TEST_CHROOT/dev/pts"
- adb shell mount | grep -q " on $ART_TEST_CHROOT/dev/cpuctl type cgroup " \
- || adb shell mount -o bind /dev/cpuctl "$ART_TEST_CHROOT/dev/cpuctl"
+ adb shell mount | grep -q " on $ART_TEST_CHROOT/dev/cpuset type cgroup " \
+ || adb shell mount -o bind /dev/cpuset "$ART_TEST_CHROOT/dev/cpuset"
# Create /apex directory in chroot.
adb shell mkdir -p "$ART_TEST_CHROOT/apex"
diff --git a/tools/buildbot-teardown-device.sh b/tools/buildbot-teardown-device.sh
index 1c82bba..156b4f1 100755
--- a/tools/buildbot-teardown-device.sh
+++ b/tools/buildbot-teardown-device.sh
@@ -95,7 +95,7 @@
adb shell rm -rf "$ART_TEST_CHROOT/apex"
# Remove /dev from chroot.
- remove_filesystem_from_chroot dev/cpuctl cgroup false
+ remove_filesystem_from_chroot dev/cpuset cgroup false
remove_filesystem_from_chroot dev/pts devpts false
remove_filesystem_from_chroot dev tmpfs true