OSDN Git Service

AAPT2: Auto-version adaptive-icon XML
authorAdam Lesinski <adamlesinski@google.com>
Mon, 26 Jun 2017 21:57:22 +0000 (14:57 -0700)
committerAdam Lesinski <adamlesinski@google.com>
Wed, 28 Jun 2017 18:20:17 +0000 (11:20 -0700)
commit5b7337f77cf036dda2c7218ccf22dedc774dcf76
treeb7aab8df43eeff70759f84e45da95b507edfddcc
parent8276d0e1527ad08aae3ec39529b10477358a1dae
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
13 files changed:
libs/androidfw/ResourceTypes.cpp
tools/aapt2/ConfigDescription.cpp
tools/aapt2/ConfigDescription.h
tools/aapt2/cmd/Link.cpp
tools/aapt2/integration-tests/AppOne/res/drawable/adaptive-icon.xml [new file with mode: 0644]
tools/aapt2/link/AutoVersioner.cpp
tools/aapt2/link/AutoVersioner_test.cpp
tools/aapt2/link/Linkers.h
tools/aapt2/readme.md
tools/aapt2/util/TypeTraits.h
tools/aapt2/util/Util.h
tools/aapt2/xml/XmlUtil.cpp
tools/aapt2/xml/XmlUtil.h