Roll buildroot to pick up new NDK r17b (#6131)

84254682 · Michael Goderbauer · GitHub · f612a761 · 84254682 · 84254682
隐藏空白更改
内联并排

Showing with 5 addition and 2 deletion

DEPS DEPS +1 -1

fml/platform/linux/timerfd.h fml/platform/linux/timerfd.h +4 -1

未找到文件。
--- a/DEPS
+++ b/DEPS
@@ -115,7 +115,7 @@ allowed_hosts = [
 ]

 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '4fd7a2738de8fc8f9b498437cde96c1bf7562a04',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '101c573fa3d412f1a0a8e391905b817bb830a93f',

   # Fuchsia compatibility
   #

--- a/fml/platform/linux/timerfd.h
+++ b/fml/platform/linux/timerfd.h
@@ -8,7 +8,10 @@
 #include "flutter/fml/time/time_point.h"

 // clang-format off
-#if __has_include(<sys/timerfd.h>)
+#if __has_include(<sys/timerfd.h>) && \
+    (!defined(__ANDROID_API__) || __ANDROID_API__ >= 19)
+    // sys/timerfd.h is always present in Android NDK due to unified headers,
+    // but timerfd functions are only available on API 19 or later.
 // clang-format on

 #include <sys/timerfd.h>