| commit | bd4ad40e33630db0af5151b110a1b49755a0cd58 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Fri Jun 19 04:59:18 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 19 04:59:18 2020 +0000 |
| tree | 8f3b2de32883f9fe1f73a44f6c732683ae146a8c | |
| parent | a9a6ec3c7b79aa3df3031db5bcf598e507148ea6 [diff] | |
| parent | 2d12844a4e2605886539d5011d94ae94b090c897 [diff] |
[automerger skipped] waitForProgsLoaded() - reduce log spaminess am: 2d12844a4e -s ours am skip reason: Change-Id I77b82bf44141df8ffab1d11d01a89c3927fbe827 with SHA-1 2090e3449d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11920083 Change-Id: I15f6a982e093ca8a1be936452b123e01a25b2ad6
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/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> /*