diff options
| author | 2018-07-19 20:32:19 -0700 | |
|---|---|---|
| committer | 2018-07-20 01:11:48 -0700 | |
| commit | 92b1ebea095f9cac70b81ae7382ae69583c9914d (patch) | |
| tree | febbe33b72feddd8d962a799a5217c31a496d215 /include/android/sharedmem.h | |
| parent | 331248ee77d0dbb8e0afed025ce1e41ac1d849e8 (diff) | |
Restore __ANDROID_API__ guards for core <android/*> APIs
This commit restores the __ANDROID_API__ guards removed in
"Add __INTRODUCED_IN to core <android/*.h> APIs.",
commit 9db409b053460e065cefb1d1caefe048f90cfff0.
Add a guard to surface_texture.h.
In choreographer.h, declare the types even for older APIs.
Bug: http://b/111668906
Test: builds
Change-Id: Ia013f48a109310f9f8ca6a3211f28fcb69dd602d
Diffstat (limited to 'include/android/sharedmem.h')
| -rw-r--r-- | include/android/sharedmem.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/android/sharedmem.h b/include/android/sharedmem.h index 0354f17f48..b772f7093c 100644 --- a/include/android/sharedmem.h +++ b/include/android/sharedmem.h @@ -27,6 +27,7 @@ #define ANDROID_SHARED_MEMORY_H #include <stddef.h> +#include <sys/cdefs.h> /****************************************************************** * @@ -52,6 +53,8 @@ extern "C" { #endif +#if __ANDROID_API__ >= 26 + /** * Create a shared memory region. * @@ -106,6 +109,8 @@ size_t ASharedMemory_getSize(int fd) __INTRODUCED_IN(26); */ int ASharedMemory_setProt(int fd, int prot) __INTRODUCED_IN(26); +#endif // __ANDROID_API__ >= 26 + #ifdef __cplusplus }; #endif |