Merge changes I12d6aa4e,I9e802113,I2b30e0fc,Iaf387b9e
* changes:
logcat: remove dead label code
logcat: do not stop on unexpected log ID
Revert "logd: Add minimum time bucket statistics"
liblog: Instrument logging of logd write drops
diff --git a/fs_mgr/fs_mgr_verity.c b/fs_mgr/fs_mgr_verity.c
index 70f40fe..028791c 100644
--- a/fs_mgr/fs_mgr_verity.c
+++ b/fs_mgr/fs_mgr_verity.c
@@ -431,7 +431,7 @@
}
if (lseek(fd, s.st_size - size, SEEK_SET) == -1) {
- ERROR("Failed to lseek %zu %s (%s)\n", s.st_size - size, fname,
+ ERROR("Failed to lseek %jd %s (%s)\n", (intmax_t)(s.st_size - size), fname,
strerror(errno));
goto out;
}
diff --git a/liblog/logprint.c b/liblog/logprint.c
index 8093a4c..b5145fd 100644
--- a/liblog/logprint.c
+++ b/liblog/logprint.c
@@ -20,6 +20,7 @@
#include <arpa/inet.h>
#include <assert.h>
#include <ctype.h>
+#include <endian.h>
#include <errno.h>
#include <stdbool.h>
#include <stdint.h>