diff options
author | Adam Lesinski <adamlesinski@google.com> | 2017-10-19 22:23:58 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-19 22:23:58 +0000 |
commit | c2e67f4b5ca13a847689a6b36fc40efa9c0c5301 (patch) | |
tree | d67e689da858981c284971ae27036a49073a586b /tools/aapt2/ResourceValues.cpp | |
parent | 0f56a1014a794e06caf38b1d84a7bd6931e50853 (diff) | |
parent | 5fae742a1e5ff0dcfa870b4521a9db796d9db4f9 (diff) |
Merge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev am: 8da74b1bfd
am: 5fae742a1e
Change-Id: I7dfb1a020b1c3da9e0af5a7096fda0775751eab3
Diffstat (limited to 'tools/aapt2/ResourceValues.cpp')
-rw-r--r-- | tools/aapt2/ResourceValues.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/aapt2/ResourceValues.cpp b/tools/aapt2/ResourceValues.cpp index e0137290f5ee..608316083f41 100644 --- a/tools/aapt2/ResourceValues.cpp +++ b/tools/aapt2/ResourceValues.cpp @@ -65,7 +65,7 @@ bool RawString::Equals(const Value* value) const { } RawString* RawString::Clone(StringPool* new_pool) const { - RawString* rs = new RawString(new_pool->MakeRef(*value)); + RawString* rs = new RawString(new_pool->MakeRef(value)); rs->comment_ = comment_; rs->source_ = source_; return rs; @@ -207,7 +207,7 @@ bool String::Flatten(android::Res_value* out_value) const { } String* String::Clone(StringPool* new_pool) const { - String* str = new String(new_pool->MakeRef(*value)); + String* str = new String(new_pool->MakeRef(value)); str->comment_ = comment_; str->source_ = source_; str->untranslatable_sections = untranslatable_sections; @@ -290,7 +290,7 @@ bool FileReference::Flatten(android::Res_value* out_value) const { } FileReference* FileReference::Clone(StringPool* new_pool) const { - FileReference* fr = new FileReference(new_pool->MakeRef(*path)); + FileReference* fr = new FileReference(new_pool->MakeRef(path)); fr->file = file; fr->comment_ = comment_; fr->source_ = source_; |