diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-07-28 17:10:35 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2017-07-31 17:46:28 -0700 |
| commit | 060b53d0287f9e685fb5b49b52a864ef85315a22 (patch) | |
| tree | f6011faf3724d6db46fafd68fd73dcdcb462928c /tools/aapt2/ResourceValues.cpp | |
| parent | b74691663d0c181e171b7157d57359d5ce789853 (diff) | |
AAPT2: Ensure style strings are always first in StringPool
Move the styled strings to a separate section of the StringPool so
that sorting can never mess up the order of Styles.
Bug: 63570514
Test: make aapt2_tests
Change-Id: Id2ce1355b92be1bb31ce0daa7e54ae9b5b6c2ffe
Diffstat (limited to 'tools/aapt2/ResourceValues.cpp')
| -rw-r--r-- | tools/aapt2/ResourceValues.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/aapt2/ResourceValues.cpp b/tools/aapt2/ResourceValues.cpp index 947e091e2d48..eb59175edf3b 100644 --- a/tools/aapt2/ResourceValues.cpp +++ b/tools/aapt2/ResourceValues.cpp @@ -253,10 +253,9 @@ StyledString* StyledString::Clone(StringPool* new_pool) const { } void StyledString::Print(std::ostream* out) const { - *out << "(styled string) \"" << *value->str << "\""; + *out << "(styled string) \"" << value->value << "\""; for (const StringPool::Span& span : value->spans) { - *out << " " << *span.name << ":" << span.first_char << "," - << span.last_char; + *out << " " << *span.name << ":" << span.first_char << "," << span.last_char; } } |