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

Commit 625e7415 authored by Christopher Ferris's avatar Christopher Ferris Committed by Automerger Merge Worker
Browse files

Merge "Update for new kernel headers." am: 758e5255 am: 988995e6 

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

Change-Id: I90cb2e351d97df0602ce6bf30e1e69ae6a7a02e4
parents 7c65ec5a 988995e6

init/capabilities.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -69,11 +69,12 @@ static const std::map<std::string, int> cap_map = { 
#if defined(__BIONIC__)

#if defined(__BIONIC__)

        CAP_MAP_ENTRY(PERFMON),

        CAP_MAP_ENTRY(PERFMON),

        CAP_MAP_ENTRY(BPF),

        CAP_MAP_ENTRY(BPF),

        CAP_MAP_ENTRY(CHECKPOINT_RESTORE),

#endif

#endif

};

};





#if defined(__BIONIC__)

#if defined(__BIONIC__)

static_assert(CAP_LAST_CAP == CAP_BPF, "CAP_LAST_CAP is not CAP_BPF");

static_assert(CAP_LAST_CAP == CAP_CHECKPOINT_RESTORE, "CAP_LAST_CAP is not CAP_CHECKPOINT_RESTORE");

#else

#else

static_assert(CAP_LAST_CAP == CAP_AUDIT_READ, "CAP_LAST_CAP is not CAP_AUDIT_READ");

static_assert(CAP_LAST_CAP == CAP_AUDIT_READ, "CAP_LAST_CAP is not CAP_AUDIT_READ");

#endif

#endif