diff options
author | Narayan Kamath <narayan@google.com> | 2020-03-30 13:22:15 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-30 13:22:15 +0000 |
commit | 45f8d1cf43666e6e0f00c56eb416733d6d36a895 (patch) | |
tree | cbfb17d092574c57a792924e83b498cf99aa3dd1 /tools/aapt2/java/AnnotationProcessor.h | |
parent | ecfd2f5cb91f4fc25dedaf3162058d47faad7261 (diff) | |
parent | 924069c2aa1d3fa64969868ccdf6dc8bf54fc670 (diff) |
Merge "aapt2: Preserve annotation parameters for SystemApi." into rvc-dev am: 924069c2aa
Change-Id: Ieb278c96432a0a23d65752a2c89365b02ed936f4
Diffstat (limited to 'tools/aapt2/java/AnnotationProcessor.h')
-rw-r--r-- | tools/aapt2/java/AnnotationProcessor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt2/java/AnnotationProcessor.h b/tools/aapt2/java/AnnotationProcessor.h index ae7bdb0c3ae2..fdb58468d995 100644 --- a/tools/aapt2/java/AnnotationProcessor.h +++ b/tools/aapt2/java/AnnotationProcessor.h @@ -19,6 +19,7 @@ #include <sstream> #include <string> +#include <unordered_map> #include "androidfw/StringPiece.h" @@ -70,7 +71,7 @@ class AnnotationProcessor { std::stringstream comment_; std::stringstream mAnnotations; bool has_comments_ = false; - uint32_t annotation_bit_mask_ = 0; + std::unordered_map<uint32_t, std::string> annotation_parameter_map_; void AppendCommentLine(std::string line); }; |