| commit | bfb6bae9fb5ef42e4f9ae2847f30f41938c04900 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Fri Jul 15 17:25:21 2016 -0700 |
| committer | Josh Gao <jmgao@google.com> | Mon Aug 08 16:39:07 2016 -0700 |
| tree | e75bc213342719cd3f803db5d27f4f21d9601fe0 | |
| parent | 681f6b59d26c7c9470bc681b0ca0b43c3d0835db [diff] |
versioner: replace availability attributes with annotate. Major refactor to use __attribute__((annotate)) to be able to keep track of the semantic differences between __INTRODUCED_IN(x) and __INTRODUCED_IN_X86(x), for use in the upcoming preprocessor. Bug: http://b/30170081 Change-Id: I6496a8c40ba7f4553de9a2be0bbddcf37c813937
diff --git a/tools/versioner/tests/multiple_decl_mismatch/expected_fail b/tools/versioner/tests/multiple_decl_mismatch/expected_fail index 6d0d209..8e8c846 100644 --- a/tools/versioner/tests/multiple_decl_mismatch/expected_fail +++ b/tools/versioner/tests/multiple_decl_mismatch/expected_fail
@@ -1,5 +1,8 @@ -foo: availability mismatch for arm-9 - foo declared in 2 locations: - extern function declaration @ headers/bar.h:1:5 [obsoleted = 12] - extern function declaration @ headers/foo.h:1:5 [obsoleted = 9] +versioner: inconsistent availability for symbol 'foo' +versioner: failed to calculate symbol availability + foo: invalid + extern declaration @ headers/bar.h:1:1 + obsoleted = 12 + extern declaration @ headers/foo.h:1:1 + obsoleted = 9 versioner: sanity check failed
diff --git a/tools/versioner/tests/multiple_decl_mismatch/headers/bar.h b/tools/versioner/tests/multiple_decl_mismatch/headers/bar.h index 95f0174..1d3a28c 100644 --- a/tools/versioner/tests/multiple_decl_mismatch/headers/bar.h +++ b/tools/versioner/tests/multiple_decl_mismatch/headers/bar.h
@@ -1 +1 @@ -int foo() __attribute__((availability(android, obsoleted = 12))); +int foo() __REMOVED_IN(12); \ No newline at end of file
diff --git a/tools/versioner/tests/multiple_decl_mismatch/headers/foo.h b/tools/versioner/tests/multiple_decl_mismatch/headers/foo.h index 9c81a89..49a73ec 100644 --- a/tools/versioner/tests/multiple_decl_mismatch/headers/foo.h +++ b/tools/versioner/tests/multiple_decl_mismatch/headers/foo.h
@@ -1 +1 @@ -int foo() __attribute__((availability(android, obsoleted = 9))); +int foo() __REMOVED_IN(9); \ No newline at end of file
diff --git a/tools/versioner/tests/multiple_decl_mismatch/run.sh b/tools/versioner/tests/multiple_decl_mismatch/run.sh index 8babb73..a34fda8 100644 --- a/tools/versioner/tests/multiple_decl_mismatch/run.sh +++ b/tools/versioner/tests/multiple_decl_mismatch/run.sh
@@ -1 +1 @@ -versioner headers -p platforms -r arm -a 9 +versioner headers -p platforms -r arm -a 9 -i \ No newline at end of file