From fdaaef95238d1de873040482938585cb01f724d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 19 Nov 2024 19:24:54 +0000 Subject: [PATCH] Revert "libprocessgroup: Remove __BEGIN_DECLS and __END_DECLS" This reverts commit fdf4432356ddb597f46cfb7b047ab4e0bb808ba2. Reason for revert: b/379796721 Change-Id: I34cdc69d5b8d11446da02106b7bd593a8c8151c3 --- libprocessgroup/include/processgroup/processgroup.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libprocessgroup/include/processgroup/processgroup.h b/libprocessgroup/include/processgroup/processgroup.h index 6a026a717..d27b56895 100644 --- a/libprocessgroup/include/processgroup/processgroup.h +++ b/libprocessgroup/include/processgroup/processgroup.h @@ -16,6 +16,7 @@ #pragma once +#include #include #include #include @@ -23,6 +24,8 @@ #include #include +__BEGIN_DECLS + static constexpr std::string CGROUPV2_HIERARCHY_NAME = "cgroup2"; bool CgroupsAvailable(); @@ -36,6 +39,8 @@ bool SetTaskProfiles(pid_t tid, const std::vector& profiles, bool SetProcessProfiles(uid_t uid, pid_t pid, const std::vector& profiles); bool SetUserProfiles(uid_t uid, const std::vector& profiles); +__END_DECLS + bool SetTaskProfiles(pid_t tid, std::initializer_list profiles, bool use_fd_cache = false); bool SetProcessProfiles(uid_t uid, pid_t pid, std::initializer_list profiles); @@ -45,6 +50,7 @@ bool SetTaskProfiles(pid_t tid, std::span profiles, bool SetProcessProfiles(uid_t uid, pid_t pid, std::span profiles); #endif +__BEGIN_DECLS #ifndef __ANDROID_VNDK__ @@ -90,3 +96,5 @@ bool getAttributePathForTask(const std::string& attr_name, pid_t tid, std::strin bool isProfileValidForProcess(const std::string& profile_name, uid_t uid, pid_t pid); #endif // __ANDROID_VNDK__ + +__END_DECLS