commit fbf251b0c11dbd52bb4261bf7df942156e381d89
author Elliott Hughes <enh@google.com> Tue Aug 20 19:33:51 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 20 19:33:51 2019 -0700
tree 393aa344eb36f7f44a9bf745032950d880633c49
parent f90521b5eae4f7293b475daafa50c74f89d7cf9b
parent d4123f9af6535b2f9467a1c09e71753d54ef5df1

Merge "Automatically include <android/ndk-version.h> from every header." am: d4e1db56b8 am: 1011864f41 am: 231d9f41a0 am: 7c15f3d222
am: d4123f9af6

Change-Id: Ic276da518e76877950802f2266536a2b1b965184

libc/include/sys/cdefs.h

diff --git a/libc/include/sys/cdefs.h b/libc/include/sys/cdefs.h
index dceb116..689b650 100644
--- a/libc/include/sys/cdefs.h
+++ b/libc/include/sys/cdefs.h
@@ -361,3 +361,6 @@
 
 #include <android/versioning.h>
 #include <android/api-level.h>
+#if __has_include(<android/ndk-version.h>)
+#include <android/ndk-version.h>
+#endif