summaryrefslogtreecommitdiff
path: root/tools/aapt2/StringPool.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-10-19 21:31:10 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-10-19 21:31:10 +0000
commit8da74b1bfdf4568788223e91c161591235b4ad42 (patch)
tree81577dcae70709165a6b148f8729c9b710169695 /tools/aapt2/StringPool.cpp
parent4b7f43bcae20e5fe0f452098c70359e6d54885c5 (diff)
parent8a0b238b1344dae0042bbb17b71c0c3b9b881f22 (diff)
Merge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev
Diffstat (limited to 'tools/aapt2/StringPool.cpp')
-rw-r--r--tools/aapt2/StringPool.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/aapt2/StringPool.cpp b/tools/aapt2/StringPool.cpp
index 705b1ab052af..3a1a18c01e1c 100644
--- a/tools/aapt2/StringPool.cpp
+++ b/tools/aapt2/StringPool.cpp
@@ -191,6 +191,13 @@ StringPool::Ref StringPool::MakeRefImpl(const StringPiece& str, const Context& c
return Ref(borrow);
}
+StringPool::Ref StringPool::MakeRef(const Ref& ref) {
+ if (ref.entry_->pool_ == this) {
+ return ref;
+ }
+ return MakeRef(ref.entry_->value, ref.entry_->context);
+}
+
StringPool::StyleRef StringPool::MakeRef(const StyleString& str) {
return MakeRef(str, Context{});
}