| commit | 1d71875ec956af0b99c22c39e935f11dfdab545c | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Wed Jun 24 06:55:59 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 24 06:55:59 2020 +0000 |
| tree | 1e3d77ffb33703eb10b9a96a7cf13aa7b42752c5 | |
| parent | a77aaebe0276cd50dcf7b88d5ebe38a52bfdcc33 [diff] | |
| parent | 20f74bc41aae49f5e82272ad6c39dfeb2dcc580e [diff] |
[automerger skipped] launch bpfloader earlier, and reboot the device on bpfloader failure am: 20f74bc41a -s ours am skip reason: Change-Id If11d491d78958ff18290e826011d2593f58d217d with SHA-1 6bd207e96b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11980907 Change-Id: I2767643a33d2aaf6d63f38bac3079b4c183e7012
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> /*