ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Remove obsolete <linux/capabilities.h> workarounds." into main am: b0bff22429 am: fd605f23d1 am: e8c6297e96 am: 7b986c5477

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2770138

Change-Id: Iba38a3fe57caf0a63a09fa9ab633ddfa14e7723e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes 2023-10-02 20:47:22 +00:00 • committed by Automerger Merge Worker
commit 2cdc3fdecc
2 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
init/capabilities.cpp
View file

@ -66,18 +66,12 @@ static const std::map<std::string, int> cap_map = {
CAP_MAP_ENTRY(WAKE_ALARM), CAP_MAP_ENTRY(WAKE_ALARM),
CAP_MAP_ENTRY(BLOCK_SUSPEND), CAP_MAP_ENTRY(BLOCK_SUSPEND),
CAP_MAP_ENTRY(AUDIT_READ), CAP_MAP_ENTRY(AUDIT_READ),
#if defined(__BIONIC__)
CAP_MAP_ENTRY(PERFMON), CAP_MAP_ENTRY(PERFMON),
CAP_MAP_ENTRY(BPF), CAP_MAP_ENTRY(BPF),
CAP_MAP_ENTRY(CHECKPOINT_RESTORE), CAP_MAP_ENTRY(CHECKPOINT_RESTORE),
#endif
}; };
#if defined(__BIONIC__)
static_assert(CAP_LAST_CAP == CAP_CHECKPOINT_RESTORE, "CAP_LAST_CAP is not CAP_CHECKPOINT_RESTORE"); static_assert(CAP_LAST_CAP == CAP_CHECKPOINT_RESTORE, "CAP_LAST_CAP is not CAP_CHECKPOINT_RESTORE");
#else
static_assert(CAP_LAST_CAP == CAP_AUDIT_READ, "CAP_LAST_CAP is not CAP_AUDIT_READ");
#endif
static bool ComputeCapAmbientSupported() { static bool ComputeCapAmbientSupported() {
#if defined(__ANDROID__) #if defined(__ANDROID__)

11
init/capabilities.h
View file

@ -21,17 +21,6 @@
#include <string> #include <string>
#include <type_traits> #include <type_traits>
#if !defined(__ANDROID__)
#ifndef CAP_BLOCK_SUSPEND
#define CAP_BLOCK_SUSPEND 36
#endif
#ifndef CAP_AUDIT_READ
#define CAP_AUDIT_READ 37
#endif
#undef CAP_LAST_CAP
#define CAP_LAST_CAP CAP_AUDIT_READ
#endif
namespace android { namespace android {
namespace init { namespace init {