OSDN Git Service

AAPT2: Ensure style strings are always first in StringPool
authorAdam Lesinski <adamlesinski@google.com>
Sat, 29 Jul 2017 00:10:35 +0000 (17:10 -0700)
committerAdam Lesinski <adamlesinski@google.com>
Sat, 5 Aug 2017 00:29:13 +0000 (17:29 -0700)
commit5b6ee115489ce93dafce57d7f5ac33564cd6ef52
treec066ff004324618110f627942c635fab61789542
parent2b991665da34f34fb842ba77502989885e58f1b2
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
16 files changed:
tools/aapt2/ResourceParser.cpp
tools/aapt2/ResourceParser_test.cpp
tools/aapt2/ResourceUtils.cpp
tools/aapt2/ResourceValues.cpp
tools/aapt2/StringPool.cpp
tools/aapt2/StringPool.h
tools/aapt2/StringPool_test.cpp
tools/aapt2/compile/PseudolocaleGenerator.cpp
tools/aapt2/compile/PseudolocaleGenerator_test.cpp
tools/aapt2/flatten/TableFlattener.cpp
tools/aapt2/flatten/XmlFlattener.cpp
tools/aapt2/proto/ProtoHelpers.cpp
tools/aapt2/proto/TableProtoDeserializer.cpp
tools/aapt2/proto/TableProtoSerializer.cpp
tools/aapt2/unflatten/BinaryResourceParser.cpp
tools/aapt2/util/Util.h