From b2ff32df99e40d2da9a2c68cfadbca8951c3e2e4 Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Fri, 31 Aug 2018 11:28:18 -0700 Subject: [PATCH] Roll buildroot to pick up new NDK r17b (#6131) --- DEPS | 2 +- fml/platform/linux/timerfd.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 60eb3e714688e..bc2f65e8f96c7 100644 --- 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 index 5c4b965457133..4a56af5553828 100644 --- 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() +#if __has_include() && \ + (!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