From 56bf76bbab68f24bdf7817b3ec827a73da42eb92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 18 Feb 2020 14:44:06 -0800 Subject: [PATCH] Pull AID_* constants from shared location. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test: build, atest Bug: 149434314 Signed-off-by: Maciej Żenczykowski Change-Id: Iadfc7fbbfcb561e7cfafaa5806939c9f69f43d59 --- progs/include/bpf_map_def.h | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/progs/include/bpf_map_def.h b/progs/include/bpf_map_def.h index 3aee332..03ca73b 100644 --- a/progs/include/bpf_map_def.h +++ b/progs/include/bpf_map_def.h @@ -22,23 +22,9 @@ #include -// These AID_* constants are permanent constants pulled from: -// system/core/libcutils/include/private/android_filesystem_config.h -// -// We need access to them from ebpf C code for map definitions -// and thus don't want to pull in the entire header file. -// -// TODO(149434314) - switch to including some appropriate header portion -#define AID_ROOT 0 -#define AID_SYSTEM 1000 -#define AID_NETWORK_STACK 1073 -#define AID_NET_BT_ADMIN 3001 -#define AID_NET_BT 3002 -#define AID_INET 3003 -#define AID_NET_RAW 3004 -#define AID_NET_ADMIN 3005 -#define AID_NET_BW_STATS 3006 -#define AID_NET_BW_ACCT 3007 +// Pull in AID_* constants from //system/core/libcutils/include/private/android_filesystem_config.h +#define EXCLUDE_FS_CONFIG_STRUCTURES +#include /* * Map structure to be used by Android eBPF C programs. The Android eBPF loader