commit 61ac57283fecb20d4287b81b293a2579d0386c15
author Ryan Mitchell <rtmitchell@google.com> Mon Apr 16 19:28:43 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 16 19:28:43 2018 +0000
tree 7e775dd544f0beaa76474c3af1712e6e1f371bee
parent 116e05cbba0f851c0d5c0da3e1c664444ea5b6f2
parent 61ffd4029032862c871c98ac04f12d4141d59383

Merge "Revert "AAPT: Modified StringPool uniqueness detection"" into pi-dev

tools/aapt2/StringPool.cpp

diff --git a/tools/aapt2/StringPool.cpp b/tools/aapt2/StringPool.cpp
index 73a8259..b0ce9e1 100644
--- a/tools/aapt2/StringPool.cpp
+++ b/tools/aapt2/StringPool.cpp
@@ -172,10 +172,9 @@
 StringPool::Ref StringPool::MakeRefImpl(const StringPiece& str, const Context& context,
                                         bool unique) {
   if (unique) {
-    for (auto& indexed_str : indexed_strings_) {
-      if (str == indexed_str.first && context.priority == indexed_str.second->context.priority) {
-        return Ref(indexed_str.second);
-      }
+    auto iter = indexed_strings_.find(str);
+    if (iter != std::end(indexed_strings_)) {
+      return Ref(iter->second);
     }
   }
 

tools/aapt2/StringPool_test.cpp

diff --git a/tools/aapt2/StringPool_test.cpp b/tools/aapt2/StringPool_test.cpp
index 5f7d3d6..58a03de 100644
--- a/tools/aapt2/StringPool_test.cpp
+++ b/tools/aapt2/StringPool_test.cpp
@@ -61,17 +61,6 @@
   EXPECT_THAT(pool.size(), Eq(1u));
 }
 
-TEST(StringPoolTest, DoNotDedupeSameStringDifferentPriority) {
-  StringPool pool;
-
-  StringPool::Ref ref_a = pool.MakeRef("wut", StringPool::Context(1));
-  StringPool::Ref ref_b = pool.MakeRef("wut", StringPool::Context(2));
-
-  EXPECT_THAT(*ref_a, Eq("wut"));
-  EXPECT_THAT(*ref_b, Eq("wut"));
-  EXPECT_THAT(pool.size(), Eq(2u));
-}
-
 TEST(StringPoolTest, MaintainInsertionOrderIndex) {
   StringPool pool;
 
@@ -303,6 +292,7 @@
   }
 }
 
+
 TEST(StringPoolTest, MaxEncodingLength) {
   StdErrDiagnostics diag;
   using namespace android;  // For NO_ERROR on Windows.