commit 060b53d0287f9e685fb5b49b52a864ef85315a22
author Adam Lesinski <adamlesinski@google.com> Fri Jul 28 17:10:35 2017 -0700
committer Adam Lesinski <adamlesinski@google.com> Mon Jul 31 17:46:28 2017 -0700
tree f6011faf3724d6db46fafd68fd73dcdcb462928c
parent b74691663d0c181e171b7157d57359d5ce789853

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

tools/aapt2/proto/TableProtoDeserializer.cpp

diff --git a/tools/aapt2/proto/TableProtoDeserializer.cpp b/tools/aapt2/proto/TableProtoDeserializer.cpp
index 4b56192..37d5ed0 100644
--- a/tools/aapt2/proto/TableProtoDeserializer.cpp
+++ b/tools/aapt2/proto/TableProtoDeserializer.cpp
@@ -195,8 +195,7 @@
           spans++;
         }
         return util::make_unique<StyledString>(pool->MakeRef(
-            style_str,
-            StringPool::Context(StringPool::Context::kStylePriority, config)));
+            style_str, StringPool::Context(StringPool::Context::kNormalPriority, config)));
       }
       return util::make_unique<String>(
           pool->MakeRef(str, StringPool::Context(config)));