From 5b7337f77cf036dda2c7218ccf22dedc774dcf76 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Mon, 26 Jun 2017 14:57:22 -0700 Subject: AAPT2: Auto-version adaptive-icon XML Auto version adaptive-icon XML to v26. This change makes the logic for generating versioned resources simpler by changing the comparison function of ResTable_config to evaluate the sdkVersion property last, making configurations that differ only in sdkVersion next to each other in a sorted vector. Bug: 62316340 Test: manual (verified output of tools/aapt2/integration-tests/AppOne) Change-Id: I977d45821722a65d2135efb4693304eacc565c9a --- tools/aapt2/ConfigDescription.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tools/aapt2/ConfigDescription.cpp') diff --git a/tools/aapt2/ConfigDescription.cpp b/tools/aapt2/ConfigDescription.cpp index 7ff0c7227c9c..f16d806fe5c7 100644 --- a/tools/aapt2/ConfigDescription.cpp +++ b/tools/aapt2/ConfigDescription.cpp @@ -987,4 +987,8 @@ bool ConfigDescription::IsCompatibleWith(const ConfigDescription& o) const { return !ConflictsWith(o) && !Dominates(o) && !o.Dominates(*this); } +::std::ostream& operator<<(::std::ostream& out, const ConfigDescription& o) { + return out << o.toString().string(); +} + } // namespace aapt -- cgit v1.2.3-59-g8ed1b