Merge "Update for new kernel headers." am: 758e52551f am: 988995e6e1

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

Change-Id: I90cb2e351d97df0602ce6bf30e1e69ae6a7a02e4
This commit is contained in:
Christopher Ferris 2020-10-22 07:21:02 +00:00 committed by Automerger Merge Worker
commit 625e741561

View file

@ -69,11 +69,12 @@ static const std::map<std::string, int> cap_map = {
#if defined(__BIONIC__)
CAP_MAP_ENTRY(PERFMON),
CAP_MAP_ENTRY(BPF),
CAP_MAP_ENTRY(CHECKPOINT_RESTORE),
#endif
};
#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
static_assert(CAP_LAST_CAP == CAP_AUDIT_READ, "CAP_LAST_CAP is not CAP_AUDIT_READ");
#endif