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

1 files changed, 9 insertions, 0 deletions

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>& configList,
+                                                const ConfigDescription& sourceConfig,
+                                                const int sdkVersionToGenerate);
 
     ResourceTable(Bundle* bundle, const String16& assetsPackage, PackageType type);