73d1fb9579
This commit fixes an inline and non-inline mismatch error caused by `get_device_api_level_inlines.h`. Versioner includes both `android/api-level.h` and `bits/get_device_api_level_inlines.h` in the test. When __ANDROID_API__ is greater than or equal to __ANDROID_API_Q__, `android/api-level.h` declares a non-inline `android_get_device_api_level()`. On the contrary, `bits/get_device_api_level_inlines.h` defines a static inline `android_get_device_api_level()` function. These conflicting declarations result in compilation error. This commit fixes the problem by guarding full `get_device_api_level_inline.h` with `#if defined(__BIONIC_GET_DEVICE_API_LEVEL_INLINE)` so that `get_device_api_level_inline.h` can be no-op when it is not properly included. Note: This is not revealed until recently because API level 29 is added in Mar 14 and the prebuilt binary for versioner hasn't been updated. Test: ./bionic/tools/versioner/run_tests.py Change-Id: Ia7d5fbdcaf3d98787e60780f6cff2a24016324f5 |
||
---|---|---|
.. | ||
fortify | ||
auxvec.h | ||
elf_arm.h | ||
elf_arm64.h | ||
elf_mips.h | ||
elf_x86.h | ||
elf_x86_64.h | ||
epoll_event.h | ||
fcntl.h | ||
fenv_arm.h | ||
fenv_inlines_arm.h | ||
fenv_inlines_mips.h | ||
fenv_mips.h | ||
fenv_x86.h | ||
fenv_x86_64.h | ||
get_device_api_level_inlines.h | ||
getopt.h | ||
glibc-syscalls.h | ||
in_addr.h | ||
ioctl.h | ||
ip_mreq_source.h | ||
ip_msfilter.h | ||
lockf.h | ||
mbstate_t.h | ||
posix_limits.h | ||
pthread_types.h | ||
sa_family_t.h | ||
seek_constants.h | ||
signal_types.h | ||
strcasecmp.h | ||
struct_file.h | ||
sysconf.h | ||
termios_inlines.h | ||
timespec.h | ||
wait.h | ||
wchar_limits.h | ||
wctype.h |