summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifan Hong2018-01-10 16:51:59 -0600
committerYifan Hong2018-01-12 14:37:00 -0600
commit0f529fab7c41b36014b90813e646b9f4a6bfc59b (patch)
tree0cfabbe49f07d555ac1114af2abc04856e6e0674 /parse_string.cpp
parent47f1045ec7651e8b3bf56cd2d3bac221ca14671a (diff)
downloadplatform-system-libvintf-0f529fab7c41b36014b90813e646b9f4a6bfc59b.tar.gz
platform-system-libvintf-0f529fab7c41b36014b90813e646b9f4a6bfc59b.tar.xz
platform-system-libvintf-0f529fab7c41b36014b90813e646b9f4a6bfc59b.zip
Mark Vndk / VndkVersionRange as deprecated.
<vndk> tag becomes deprecated and should not be used. <vendor-ndk> is used to replace it instead. Test: builds Bug: 36400653 Change-Id: Ibeaa6c366fd78f3d4b0f06c13d8a33b71f4be1cf
Diffstat (limited to 'parse_string.cpp')
-rw-r--r--parse_string.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/parse_string.cpp b/parse_string.cpp
index 7e23f5f..6b6e9a0 100644
--- a/parse_string.cpp
+++ b/parse_string.cpp
@@ -258,6 +258,8 @@ std::ostream &operator<<(std::ostream &os, const VersionRange &vr) {
258 return os << vr.minVer() << "-" << vr.maxMinor; 258 return os << vr.minVer() << "-" << vr.maxMinor;
259} 259}
260 260
261#pragma clang diagnostic push
262#pragma clang diagnostic ignored "-Wdeprecated-declarations"
261bool parse(const std::string &s, VndkVersionRange *vr) { 263bool parse(const std::string &s, VndkVersionRange *vr) {
262 std::vector<std::string> v = SplitString(s, '-'); 264 std::vector<std::string> v = SplitString(s, '-');
263 if (v.size() != 1 && v.size() != 2) { 265 if (v.size() != 1 && v.size() != 2) {
@@ -287,6 +289,7 @@ std::ostream &operator<<(std::ostream &os, const VndkVersionRange &vr) {
287 } 289 }
288 return os; 290 return os;
289} 291}
292#pragma clang diagnostic pop
290 293
291bool parse(const std::string &s, KernelVersion *kernelVersion) { 294bool parse(const std::string &s, KernelVersion *kernelVersion) {
292 std::vector<std::string> v = SplitString(s, '.'); 295 std::vector<std::string> v = SplitString(s, '.');