| commit | 3ba973a7ddda7bfa12076fa06683675a4cd21569 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Nov 09 02:20:37 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 09 02:20:37 2016 +0000 |
| tree | db55b8218b2c19102c9558ebfc45b4ab61e2cb84 | |
| parent | cf969e7c167988915030957ac2e297eef710d282 [diff] | |
| parent | 73a4998c7de4f5d7ab7fbd752403d1b2f9f3e679 [diff] |
Merge "versioner: don't always hide future decls." am: 84e269d5af am: 73a4998c7d Change-Id: I55005e7f8f64d8b3b11ea7f341ff8dcf534b3694
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;