| commit | 9ae2b9a5213219e929e5cab6cea3f1f1e476d2fd | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Tue Nov 08 16:17:45 2016 -0800 |
| committer | Josh Gao <jmgao@google.com> | Tue Nov 08 16:28:07 2016 -0800 |
| tree | 724d367bbca0ed14f34eff36e077d6b601ec1416 | |
| parent | 42eb0b255507ca4d3b4e94b7756c15ab742261c0 [diff] |
versioner: don't always hide future decls. Bug: http://b/32748732 Test: python run_tests.py Change-Id: I8f799015ebb1017f5e7d1324fb4c724e12a268bc
diff --git a/tools/versioner/src/Preprocessor.cpp b/tools/versioner/src/Preprocessor.cpp index da5d250..a52ce53 100644 --- a/tools/versioner/src/Preprocessor.cpp +++ b/tools/versioner/src/Preprocessor.cpp
@@ -221,7 +221,7 @@ 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.
diff --git a/tools/versioner/tests/preprocessor/expected/foo.h b/tools/versioner/tests/preprocessor/expected/foo.h index b83dd07..73947b2 100644 --- a/tools/versioner/tests/preprocessor/expected/foo.h +++ b/tools/versioner/tests/preprocessor/expected/foo.h
@@ -68,3 +68,9 @@ 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__ */ +
diff --git a/tools/versioner/tests/preprocessor/headers/foo.h b/tools/versioner/tests/preprocessor/headers/foo.h index 7eba47f..81c8b4b 100644 --- a/tools/versioner/tests/preprocessor/headers/foo.h +++ b/tools/versioner/tests/preprocessor/headers/foo.h
@@ -40,3 +40,5 @@ __INTRODUCED_IN_64(22); int group_lp32() __INTRODUCED_IN_ARM(12) __INTRODUCED_IN_X86(12) __INTRODUCED_IN_MIPS(12); + +int future() __INTRODUCED_IN_FUTURE;