bionic/libc/include/sys/epoll.h:67:8: error: redefinition of 'epoll_event'

Question

我在为 lineageos 项目构建 ROM 时遇到以下异常，需要一些帮助来诊断和解决问题：

In file included from device/lenovo/tb8504f/camera/QCamera2/util/QCameraDisplay.cpp:53:
In file included from system/core/libutils/include/utils/Looper.h:25:
bionic/libc/include/sys/epoll.h:67:8: error: redefinition of 'epoll_event'
struct epoll_event {
       ^
out/target/product/tb8504f/obj/KERNEL_OBJ/usr/include/linux/eventpoll.h:59:8: note: previous definition is here
struct epoll_event {
       ^

产生了 1 个错误。

设备树:= https://github.com/darran-kelinske-fivestars/android_device_lenovo_tb8504f/tree/lineage-15.1

供应商树:= https://github.com/darran-kelinske-fivestars/android_vendor_lenovo_tb8504f/tree/lineage-15.1

内核源码:= https://github.com/dazza5000/android_kernel_lenovo_msm8937/tree/tb8504f

ROM 来源:= https://github.com/LineageOS/android

命令：

repo sync -j20 && source build/envsetup.sh && breakfast tb8504f && make -j20 | tee rom.log

完整日志：

https://del.dog/qaridufuca

Answer 1

我通过从包含以下检查的不同内核版本借用代码来修复此问题

#ifdef __KERNEL__

下面的完整代码段：

#ifdef __KERNEL__
struct epoll_event {
struct epoll_event {
    __u32 events;
    __u32 events;
    __u64 data;
    __u64 data;
@@ -73,4 +74,5 @@ static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev)
    epev->events &= ~EPOLLWAKEUP;
    epev->events &= ~EPOLLWAKEUP;
}
}
#endif
#endif
#endif /* __KERNEL__ */

提交：

https://github.com/dazza5000/android_kernel_lenovo_msm8937/commit/ab8195cd2bc6f1c283d79568540d5792c9ed55c2

bionic/libc/include/sys/epoll.h:67:8: error: redefinition of 'epoll_event'

bionic/libc/include/sys/epoll.h:67:8: error: redefinition of 'epoll_event'

android-kernel

lineageos