diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-09-15 16:57:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-15 16:57:21 +0000 |
| commit | e33de76a16f6acc42858766460976f44e629657d (patch) | |
| tree | ce962def3f718730407e6863a14aaf0df9a66787 /tools/aapt2/unflatten/BinaryResourceParser.cpp | |
| parent | d2d6c257f141ed38da2cf0d0a2f84c6f7f055e92 (diff) | |
| parent | e02983681ae85212c2263055fd4bcfd8097f19bc (diff) | |
Merge changes Id8bdb14e,I573a6735,Ia804777f,Ia68122cb,Ia1997800, ... into oc-mr1-dev
am: e02983681a
Change-Id: I42369e6fb7bd121e45b5a002cd5f00e05221ead3
Diffstat (limited to 'tools/aapt2/unflatten/BinaryResourceParser.cpp')
| -rw-r--r-- | tools/aapt2/unflatten/BinaryResourceParser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/unflatten/BinaryResourceParser.cpp b/tools/aapt2/unflatten/BinaryResourceParser.cpp index 728d1f4207c4..892aee6fadcb 100644 --- a/tools/aapt2/unflatten/BinaryResourceParser.cpp +++ b/tools/aapt2/unflatten/BinaryResourceParser.cpp @@ -544,7 +544,7 @@ std::unique_ptr<Array> BinaryResourceParser::ParseArray( const ResTable_map_entry* map) { std::unique_ptr<Array> array = util::make_unique<Array>(); for (const ResTable_map& map_entry : map) { - array->items.push_back(ParseValue(name, config, map_entry.value)); + array->elements.push_back(ParseValue(name, config, map_entry.value)); } return array; } |