diff --git a/init/capabilities.cpp b/init/capabilities.cpp index ab6ff03ef..0e2cd2acc 100644 --- a/init/capabilities.cpp +++ b/init/capabilities.cpp @@ -66,18 +66,12 @@ static const std::map cap_map = { CAP_MAP_ENTRY(WAKE_ALARM), CAP_MAP_ENTRY(BLOCK_SUSPEND), CAP_MAP_ENTRY(AUDIT_READ), -#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_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() { #if defined(__ANDROID__) diff --git a/init/capabilities.h b/init/capabilities.h index 891e0ac98..fc80c9864 100644 --- a/init/capabilities.h +++ b/init/capabilities.h @@ -21,17 +21,6 @@ #include #include -#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 init {