Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd605f23 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Remove obsolete <linux/capabilities.h> workarounds." into main am: b0bff224 

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



Change-Id: I15862cbef6b2c0cdf0a70d2ba636a63b5e98c708
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 63a7d5bc b0bff224

init/capabilities.cpp

+0 −6
Original line number Original line Diff line number Diff line
@@ -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__)

init/capabilities.h

+0 −11
Original line number Original line Diff line number Diff line
@@ -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 {