diff options
author | android-build-team Robot | 2018-01-14 02:26:14 -0600 |
---|---|---|
committer | android-build-team Robot | 2018-01-14 02:26:14 -0600 |
commit | 920b274fd5ad9d79ffbec1d820f91f703b4d276e (patch) | |
tree | 21e4f99d52c6d8ae507625cc07557362254169aa /include/vintf/Vndk.h | |
parent | eaffd4a2a652305877545cc8d8c46d5e25b0ad3e (diff) | |
parent | b7008f8d49920594ce28dbeb36057394816d1c59 (diff) | |
download | platform-system-libvintf-920b274fd5ad9d79ffbec1d820f91f703b4d276e.tar.gz platform-system-libvintf-920b274fd5ad9d79ffbec1d820f91f703b4d276e.tar.xz platform-system-libvintf-920b274fd5ad9d79ffbec1d820f91f703b4d276e.zip |
Snap for 4545621 from b7008f8d49920594ce28dbeb36057394816d1c59 to pi-release
Change-Id: Ifd6e5d95557869080270084b84045bf13dd5c2d8
Diffstat (limited to 'include/vintf/Vndk.h')
-rw-r--r-- | include/vintf/Vndk.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/vintf/Vndk.h b/include/vintf/Vndk.h index a7d2f51..05fcac9 100644 --- a/include/vintf/Vndk.h +++ b/include/vintf/Vndk.h | |||
@@ -24,7 +24,8 @@ | |||
24 | namespace android { | 24 | namespace android { |
25 | namespace vintf { | 25 | namespace vintf { |
26 | 26 | ||
27 | struct VndkVersionRange { | 27 | // deprecated. Kept here for libvintf backwards compatibility. |
28 | struct [[deprecated]] VndkVersionRange { | ||
28 | 29 | ||
29 | VndkVersionRange() : VndkVersionRange(0u, 0u, 0u) {} | 30 | VndkVersionRange() : VndkVersionRange(0u, 0u, 0u) {} |
30 | VndkVersionRange(size_t s, size_t v, size_t p) | 31 | VndkVersionRange(size_t s, size_t v, size_t p) |
@@ -40,7 +41,8 @@ struct VndkVersionRange { | |||
40 | size_t patchMax; | 41 | size_t patchMax; |
41 | }; | 42 | }; |
42 | 43 | ||
43 | struct Vndk { | 44 | // deprecated. Kept here for libvintf backwards compatibility. |
45 | struct [[deprecated]] Vndk { | ||
44 | 46 | ||
45 | const VndkVersionRange &versionRange() const { return mVersionRange; } | 47 | const VndkVersionRange &versionRange() const { return mVersionRange; } |
46 | const std::set<std::string> &libraries() const { return mLibraries; } | 48 | const std::set<std::string> &libraries() const { return mLibraries; } |
@@ -56,10 +58,13 @@ private: | |||
56 | std::set<std::string> mLibraries; | 58 | std::set<std::string> mLibraries; |
57 | }; | 59 | }; |
58 | 60 | ||
61 | [[deprecated]] | ||
59 | inline bool operator==(const VndkVersionRange &lft, const VndkVersionRange &rgt) { | 62 | inline bool operator==(const VndkVersionRange &lft, const VndkVersionRange &rgt) { |
60 | return lft.sdk == rgt.sdk && lft.vndk == rgt.vndk && | 63 | return lft.sdk == rgt.sdk && lft.vndk == rgt.vndk && |
61 | lft.patchMin == rgt.patchMin && lft.patchMax == rgt.patchMax; | 64 | lft.patchMin == rgt.patchMin && lft.patchMax == rgt.patchMax; |
62 | } | 65 | } |
66 | |||
67 | [[deprecated]] | ||
63 | inline bool operator==(const Vndk &lft, const Vndk &rgt) { | 68 | inline bool operator==(const Vndk &lft, const Vndk &rgt) { |
64 | return lft.mVersionRange == rgt.mVersionRange && | 69 | return lft.mVersionRange == rgt.mVersionRange && |
65 | lft.mLibraries == rgt.mLibraries; | 70 | lft.mLibraries == rgt.mLibraries; |