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

flutter · Aug 31, 2018 · 8425468 · 8425468
1 parent f612a76
commit 8425468
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
    #

diff --git 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>