From beb9e33bfb79847c25aac98e39f3ea620a953ef7 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Fri, 14 Aug 2015 13:16:18 -0700 Subject: AAPT: Fix regression in resource versioning With a set of resources with the following configurations: () (land) the regression caused any resources that needed to be versioned in configuration () to be lost. Bug:23038206 Change-Id: I2f1b0313fb780ac241e7aaa487cb37dfb79c36aa --- tools/aapt/ResourceTable.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'tools/aapt/ResourceTable.h') diff --git a/tools/aapt/ResourceTable.h b/tools/aapt/ResourceTable.h index 2c1bec1fb128..c4bdf09d8b19 100644 --- a/tools/aapt/ResourceTable.h +++ b/tools/aapt/ResourceTable.h @@ -99,6 +99,15 @@ public: class Package; class Type; class Entry; + class ConfigList; + + /** + * Exposed for testing. Determines whether a versioned resource should be generated + * based on the other available configurations for that resource. + */ + static bool shouldGenerateVersionedResource(const sp& configList, + const ConfigDescription& sourceConfig, + const int sdkVersionToGenerate); ResourceTable(Bundle* bundle, const String16& assetsPackage, PackageType type); -- cgit v1.2.3-59-g8ed1b