diff options
| author | 2021-02-04 01:27:20 +0000 | |
|---|---|---|
| committer | 2021-02-04 01:27:20 +0000 | |
| commit | 202b5ab5b8b5f74f9040a5aa127a9a8ad8ff5bd7 (patch) | |
| tree | d10fbb2f8a8130f6f27b81a8c7f094960c6aafb3 /include/android/sharedmem.h | |
| parent | 819a4e805eabdcb6a320b263ef2dcc24c513138f (diff) | |
| parent | fc4d69df177cb7b3a8d64deea5c376fd9f4f06e5 (diff) | |
Merge "Remove __ANDROID_API__ #if checks." am: 7af525ef95 am: fc4d69df17
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1561095
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I130b2513bd243d9d4866a73b2d7e74b1221931fc
Diffstat (limited to 'include/android/sharedmem.h')
| -rw-r--r-- | include/android/sharedmem.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/android/sharedmem.h b/include/android/sharedmem.h index 5f74682b40..7994aa9914 100644 --- a/include/android/sharedmem.h +++ b/include/android/sharedmem.h @@ -50,8 +50,6 @@ extern "C" { #endif -#if __ANDROID_API__ >= 26 - /** * Create a shared memory region. * @@ -121,8 +119,6 @@ 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 |