diff options
author | 2017-10-19 21:31:10 +0000 | |
---|---|---|
committer | 2017-10-19 21:31:10 +0000 | |
commit | 8da74b1bfdf4568788223e91c161591235b4ad42 (patch) | |
tree | 81577dcae70709165a6b148f8729c9b710169695 /tools/aapt2/ResourceValues.cpp | |
parent | 4b7f43bcae20e5fe0f452098c70359e6d54885c5 (diff) | |
parent | 8a0b238b1344dae0042bbb17b71c0c3b9b881f22 (diff) |
Merge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev
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 1cba19462839..a5ddc524c3f5 100644 --- a/tools/aapt2/ResourceValues.cpp +++ b/tools/aapt2/ResourceValues.cpp @@ -55,7 +55,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; @@ -197,7 +197,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; @@ -280,7 +280,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_; |