Update to v5.5 kernel headers.
Kernel headers coming from:
Git: https://android.googlesource.com/kernel/common/
Branch: android-mainline
Tag: android-mainline-5.5
Test: Boots on walleye.
Test: Ran bionic-unit-tests on walleye.
Test: Boots on cuttlefish.
Test: Ran bionic-unit-tests on cuttlefish.
Change-Id: I57387d3c31e0ba5ad125ffe291cecf365c7b374e
Merged-In: I57387d3c31e0ba5ad125ffe291cecf365c7b374e
diff --git a/libc/kernel/tools/defaults.py b/libc/kernel/tools/defaults.py
index e74b346..90b56f5 100644
--- a/libc/kernel/tools/defaults.py
+++ b/libc/kernel/tools/defaults.py
@@ -29,6 +29,10 @@
"__HAVE_BUILTIN_BSWAP16__": "1",
"__HAVE_BUILTIN_BSWAP32__": "1",
"__HAVE_BUILTIN_BSWAP64__": "1",
+ # Use this to remove the struct __kernel_old_timeval definition.
+ # Otherwise, there will be two struct timeval definitions when
+ # __kernel_old_timeval is renamed to timeval.
+ "__kernel_old_timeval": "1",
}
# define to true if you want to remove all defined(CONFIG_FOO) tests
@@ -76,6 +80,12 @@
"__attribute_const__": "__attribute__((__const__))",
# In this case the kernel tries to keep out of our way, but we're happy to use its definition.
"__kernel_sockaddr_storage": "sockaddr_storage",
+ # The kernel started using struct __kernel_old_timeval in some places,
+ # which is the exact same as struct timeval. Replace that name with
+ # timeval so that kernel structures all use the same named structure.
+ # If struct __kernel_old_timeval and struct timeval become different,
+ # then a different solution needs to be implemented.
+ "__kernel_old_timeval": "timeval",
}