| commit | 868e83c89bdc42445c112cd95a1bd23faf68c0d3 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Wed Jun 24 09:35:35 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 24 09:35:35 2020 +0000 |
| tree | 1e3d77ffb33703eb10b9a96a7cf13aa7b42752c5 | |
| parent | c1e8235d07769a6d34e4a957c1167ac098a5f48e [diff] | |
| parent | 372cc578d3ab9223014eb62ef407e81df26868ba [diff] |
[automerger skipped] start bpfloader asynchronously am: 5a0fdfa8e8 am: 372cc578d3 -s ours am skip reason: Change-Id Id62009a9f888ce2092b8a1e7aef24ae4224109d5 with SHA-1 838b81de8f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11983040 Change-Id: I948ef768392a50e54ffd5023425e7927dbcfb1f2
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2 deleted file mode 100644 index e69de29..0000000 --- a/MODULE_LICENSE_APACHE2 +++ /dev/null
diff --git a/bpfloader/bpfloader.rc b/bpfloader/bpfloader.rc index 04d9b81..fec7530 100644 --- a/bpfloader/bpfloader.rc +++ b/bpfloader/bpfloader.rc
@@ -23,7 +23,7 @@ write /proc/sys/net/core/bpf_jit_enable 1 # Enable JIT kallsyms export for privileged users only write /proc/sys/net/core/bpf_jit_kallsyms 1 - start bpfloader + exec_start bpfloader service bpfloader /system/bin/bpfloader capabilities CHOWN SYS_ADMIN
diff --git a/progs/include/bpf_map_def.h b/progs/include/bpf_map_def.h index 452b682..8523c36 100644 --- a/progs/include/bpf_map_def.h +++ b/progs/include/bpf_map_def.h
@@ -23,7 +23,6 @@ #include <linux/bpf.h> // Pull in AID_* constants from //system/core/libcutils/include/private/android_filesystem_config.h -#define EXCLUDE_FS_CONFIG_STRUCTURES #include <private/android_filesystem_config.h> /*