| commit | 246e3d28f77ec1f11fdd239d022a2048bc321fef | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Thu Jun 18 05:54:41 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 18 05:54:41 2020 +0000 |
| tree | 66b90c48c1eb2ddc1a73820f1ba4cb2a2c1825ea | |
| parent | 9c95ba297f16ca92797d6cfc60d0743788023706 [diff] | |
| parent | 2464ddb0dfbe86771f371d545139dd47db36bb44 [diff] |
[automerger skipped] implement support for functions which may optionally fail to load am: 2464ddb0df -s ours am skip reason: Change-Id I50b292c061b05fc8f4b4b8574f128345c45c78db with SHA-1 aa295c8355 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11905498 Change-Id: Icdc2f08130ecfd8bbfbf8de560e0dc7e06a28e2b
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> /*