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 |
||
---|---|---|
.. | ||
arch-arm | ||
arch-arm64 | ||
arch-common/bionic | ||
arch-mips | ||
arch-mips64 | ||
arch-x86 | ||
arch-x86_64 | ||
async_safe | ||
bionic | ||
dns | ||
include | ||
kernel | ||
malloc_debug | ||
malloc_hooks | ||
private | ||
seccomp | ||
stdio | ||
stdlib | ||
system_properties | ||
tools | ||
tzcode | ||
upstream-freebsd | ||
upstream-netbsd | ||
upstream-openbsd | ||
versioner-dependencies | ||
Android.bp | ||
fs_config_generator.py | ||
libc.map.txt | ||
libstdc++.map.txt | ||
MODULE_LICENSE_BSD | ||
NOTICE | ||
SECCOMP_BLACKLIST_APP.TXT | ||
SECCOMP_BLACKLIST_COMMON.TXT | ||
SECCOMP_WHITELIST_APP.TXT | ||
SECCOMP_WHITELIST_COMMON.TXT | ||
SECCOMP_WHITELIST_GLOBAL.TXT | ||
SECCOMP_WHITELIST_SYSTEM.TXT | ||
symbol_ordering | ||
SYSCALLS.TXT | ||
version_script.txt |