Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AAPT2: Fix R.java styleable + indices ordering

Browse Source 
Make sure that Styleables are directly followed by their indices.
If not, Robolectric breaks. This is not strictly incorrect to have
an arbitrary ordering in R.java, but its easier to just support
Robolectric in this case.

Bug: 65837293
Test: make aapt2_tests

(cherry picked from commit af85c4deb667843a227d62275fe6992005f4c38d)

Change-Id: Ia59ba58427ade386d075ca9fc9eb5b53e35beca0
This commit is contained in:
Adam Lesinski
2017-09-29 11:15:17 -07:00
parent 43ddc05bbd
commit 761d4341fc
3 changed files with 86 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/aapt2/java/ClassDefinition.cpp
View File

@@ -41,18 +41,21 @@ void MethodDefinition::WriteToStream(const StringPiece& prefix, bool final,
ClassDefinition::Result ClassDefinition::AddMember(std::unique_ptr<ClassMember> member) {
Result result = Result::kAdded;
auto iter = members_.find(member);
if (iter != members_.end()) {
members_.erase(iter);
auto iter = indexed_members_.find(member->GetName());
if (iter != indexed_members_.end()) {
// Overwrite the entry.
ordered_members_[iter->second].reset();
result = Result::kOverridden;
}
members_.insert(std::move(member));
indexed_members_[member->GetName()] = ordered_members_.size();
ordered_members_.push_back(std::move(member));
return result;
}
bool ClassDefinition::empty() const {
for (const std::unique_ptr<ClassMember>& member : members_) {
if (!member->empty()) {
for (const std::unique_ptr<ClassMember>& member : ordered_members_) {
if (member != nullptr && !member->empty()) {
return false;
}
}
@@ -61,7 +64,7 @@ bool ClassDefinition::empty() const {
void ClassDefinition::WriteToStream(const StringPiece& prefix, bool final,
std::ostream* out) const {
if (members_.empty() && !create_if_empty_) {
if (empty() && !create_if_empty_) {
return;
}
@@ -76,9 +79,14 @@ void ClassDefinition::WriteToStream(const StringPiece& prefix, bool final,
std::string new_prefix = prefix.to_string();
new_prefix.append(kIndent);
for (const std::unique_ptr<ClassMember>& member : members_) {
member->WriteToStream(new_prefix, final, out);
*out << "\n";
for (const std::unique_ptr<ClassMember>& member : ordered_members_) {
// There can be nullptr members when a member is added to the ClassDefinition
// and takes precedence over a previous member with the same name. The overridden member is
// set to nullptr.
if (member != nullptr) {
member->WriteToStream(new_prefix, final, out);
*out << "\n";
}
}
*out << prefix << "}";