pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "versioner: don't always hide future decls."

This commit is contained in:
Treehugger Robot 2016-11-09 02:07:17 +00:00 committed by Gerrit Code Review
parent 64fc6b5e20 9ae2b9a521
commit 84e269d5af
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/versioner/src/Preprocessor.cpp
View File

@ -221,7 +221,7 @@ static std::string generateGuardCondition(const DeclarationAvailability& avail)
bool future = avail.arch_availability[*it.second.begin()].future;
if (future) {
return "0";
return "__ANDROID_API__ >= __ANDROID_API_FUTURE__";
}
// The maximum min_version of the set.

6
tools/versioner/tests/preprocessor/expected/foo.h
View File

@ -68,3 +68,9 @@ int multiple_introduced_2() __INTRODUCED_IN_ARM(13) __INTRODUCED_IN_MIPS(14) __I
int group_lp32() __INTRODUCED_IN_ARM(12) __INTRODUCED_IN_X86(12) __INTRODUCED_IN_MIPS(12);
#endif /* (!defined(__LP64__) && __ANDROID_API__ >= 12) || (defined(__LP64__)) */
#if __ANDROID_API__ >= __ANDROID_API_FUTURE__
int future() __INTRODUCED_IN_FUTURE;
#endif /* __ANDROID_API__ >= __ANDROID_API_FUTURE__ */

2
tools/versioner/tests/preprocessor/headers/foo.h
View File

@ -40,3 +40,5 @@ int multiple_introduced_2() __INTRODUCED_IN_ARM(13) __INTRODUCED_IN_MIPS(14) __I
__INTRODUCED_IN_64(22);
int group_lp32() __INTRODUCED_IN_ARM(12) __INTRODUCED_IN_X86(12) __INTRODUCED_IN_MIPS(12);
int future() __INTRODUCED_IN_FUTURE;