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/src/SymbolDatabase.cpp b/tools/versioner/src/SymbolDatabase.cpp
index a35f045..b5d2abb 100644
--- a/tools/versioner/src/SymbolDatabase.cpp
+++ b/tools/versioner/src/SymbolDatabase.cpp
@@ -75,7 +75,7 @@
}
std::string path = std::string(platform_dir) + "/android-" + std::to_string(api_level) +
- "/arch-" + type.arch + "/symbols/" + filename;
+ "/arch-" + to_string(type.arch) + "/symbols/" + filename;
stream = std::ifstream(path);
if (stream) {
@@ -86,7 +86,7 @@
}
if (required) {
- errx(1, "failed to find platform file '%s' for %s", filename.c_str(), type.describe().c_str());
+ errx(1, "failed to find platform file '%s' for %s", filename.c_str(), to_string(type).c_str());
}
return std::string();