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

Merge "[aapt2] Fix infinite loop in proguard::CollectLocations"

Browse Source
This commit is contained in:
Donald Chai
2019-11-08 06:08:26 +00:00
committed by Gerrit Code Review
parent c000664c7c 34ebc8f435
commit 39146bcc18
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/aapt2/java/ProguardRules.h
View File

@@ -99,11 +99,13 @@ bool CollectLocations(const UsageLocation& location, const KeepSet& keep_set,
// //
inline bool operator==(const UsageLocation& lhs, const UsageLocation& rhs) { inline bool operator==(const UsageLocation& lhs, const UsageLocation& rhs) {
// The "source" member is ignored because we only need "name" for outputting
// keep rules; "source" is used for comments.
return lhs.name == rhs.name; return lhs.name == rhs.name;
} }
inline int operator<(const UsageLocation& lhs, const UsageLocation& rhs) { inline bool operator<(const UsageLocation& lhs, const UsageLocation& rhs) {
return lhs.name.compare(rhs.name); return lhs.name.compare(rhs.name) < 0;
} }
// //

8
tools/aapt2/java/ProguardRules_test.cpp
View File

@@ -364,4 +364,12 @@ TEST(ProguardRulesTest, TransitionRulesAreEmitted) {
"-keep class com.foo.Bar { <init>(android.content.Context, android.util.AttributeSet); }")); "-keep class com.foo.Bar { <init>(android.content.Context, android.util.AttributeSet); }"));
} }
TEST(ProguardRulesTest, UsageLocationComparator) {
proguard::UsageLocation location1 = {{"pkg", ResourceType::kAttr, "x"}};
proguard::UsageLocation location2 = {{"pkg", ResourceType::kAttr, "y"}};
EXPECT_EQ(location1 < location2, true);
EXPECT_EQ(location2 < location1, false);
}
} // namespace aapt } // namespace aapt