Merge "Fix computation of 'entry_length' in AAPT2 container format"
diff --git a/tools/aapt2/java/ProguardRules.h b/tools/aapt2/java/ProguardRules.h
index f9656d1..b15df59 100644
--- a/tools/aapt2/java/ProguardRules.h
+++ b/tools/aapt2/java/ProguardRules.h
@@ -99,11 +99,13 @@
//
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;
}
-inline int operator<(const UsageLocation& lhs, const UsageLocation& rhs) {
- return lhs.name.compare(rhs.name);
+inline bool operator<(const UsageLocation& lhs, const UsageLocation& rhs) {
+ return lhs.name.compare(rhs.name) < 0;
}
//
diff --git a/tools/aapt2/java/ProguardRules_test.cpp b/tools/aapt2/java/ProguardRules_test.cpp
index 559b07a..25b55ab 100644
--- a/tools/aapt2/java/ProguardRules_test.cpp
+++ b/tools/aapt2/java/ProguardRules_test.cpp
@@ -364,4 +364,12 @@
"-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
