Merge "Reapply "libprocessgroup: Remove __BEGIN_DECLS and __END_DECLS"" into main

This commit is contained in:
T.J. Mercier 2024-11-21 22:14:07 +00:00 committed by Gerrit Code Review
commit b053403046

View file

@ -16,7 +16,6 @@
#pragma once #pragma once
#include <sys/cdefs.h>
#include <sys/types.h> #include <sys/types.h>
#include <initializer_list> #include <initializer_list>
#include <span> #include <span>
@ -24,8 +23,6 @@
#include <string_view> #include <string_view>
#include <vector> #include <vector>
__BEGIN_DECLS
static constexpr std::string CGROUPV2_HIERARCHY_NAME = "cgroup2"; static constexpr std::string CGROUPV2_HIERARCHY_NAME = "cgroup2";
bool CgroupsAvailable(); bool CgroupsAvailable();
@ -39,8 +36,6 @@ bool SetTaskProfiles(pid_t tid, const std::vector<std::string>& profiles,
bool SetProcessProfiles(uid_t uid, pid_t pid, const std::vector<std::string>& profiles); bool SetProcessProfiles(uid_t uid, pid_t pid, const std::vector<std::string>& profiles);
bool SetUserProfiles(uid_t uid, const std::vector<std::string>& profiles); bool SetUserProfiles(uid_t uid, const std::vector<std::string>& profiles);
__END_DECLS
bool SetTaskProfiles(pid_t tid, std::initializer_list<std::string_view> profiles, bool SetTaskProfiles(pid_t tid, std::initializer_list<std::string_view> profiles,
bool use_fd_cache = false); bool use_fd_cache = false);
bool SetProcessProfiles(uid_t uid, pid_t pid, std::initializer_list<std::string_view> profiles); bool SetProcessProfiles(uid_t uid, pid_t pid, std::initializer_list<std::string_view> profiles);
@ -50,7 +45,6 @@ bool SetTaskProfiles(pid_t tid, std::span<const std::string_view> profiles,
bool SetProcessProfiles(uid_t uid, pid_t pid, std::span<const std::string_view> profiles); bool SetProcessProfiles(uid_t uid, pid_t pid, std::span<const std::string_view> profiles);
#endif #endif
__BEGIN_DECLS
#ifndef __ANDROID_VNDK__ #ifndef __ANDROID_VNDK__
@ -96,5 +90,3 @@ 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); bool isProfileValidForProcess(const std::string& profile_name, uid_t uid, pid_t pid);
#endif // __ANDROID_VNDK__ #endif // __ANDROID_VNDK__
__END_DECLS