Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AAPT: mipmaps should not end up in Splits" into lmp-dev

Browse Source
This commit is contained in:
Adam Lesinski
2014-08-21 22:00:08 +00:00
committed by Android (Google) Code Review
parent b020563811 27f69f4e06
commit 628f670a54
4 changed files with 70 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/aapt/Resource.cpp
View File

@@ -1399,7 +1399,8 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets, sp<ApkBuil
sp<ApkSplit>& split = splits.editItemAt(i);
sp<AaptFile> flattenedTable = new AaptFile(String8("resources.arsc"),
AaptGroupEntry(), String8());
err = table.flatten(bundle, split->getResourceFilter(), flattenedTable);
err = table.flatten(bundle, split->getResourceFilter(),
flattenedTable, split->isBase());
if (err != NO_ERROR) {
fprintf(stderr, "Failed to generate resource table for split '%s'\n",
split->getPrintableName().string());

36
tools/aapt/ResourceTable.cpp
View File

@@ -2074,10 +2074,11 @@ bool ResourceTable::hasResources() const {
return mNumLocal > 0;
}
sp<AaptFile> ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>& filter)
sp<AaptFile> ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>& filter,
const bool isBase)
{
sp<AaptFile> data = new AaptFile(String8(), AaptGroupEntry(), String8());
status_t err = flatten(bundle, filter, data);
status_t err = flatten(bundle, filter, data, isBase);
return err == NO_ERROR ? data : NULL;
}
@@ -2699,7 +2700,9 @@ ResourceTable::validateLocalizations(void)
return err;
}
status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>& filter, const sp<AaptFile>& dest)
status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>& filter,
const sp<AaptFile>& dest,
const bool isBase)
{
const ConfigDescription nullConfig;
@@ -2768,6 +2771,13 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>&
configTypeName = "2value";
}
// mipmaps don't get filtered, so they will
// allways end up in the base. Make sure they
// don't end up in a split.
if (typeName == mipmap16 && !isBase) {
continue;
}
const bool filterable = (typeName != mipmap16);
const size_t N = t->getOrderedConfigs().size();
@@ -2871,10 +2881,12 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>&
return amt;
}
status_t err = flattenLibraryTable(data, libraryPackages);
if (err != NO_ERROR) {
fprintf(stderr, "ERROR: failed to write library table\n");
return err;
if (isBase) {
status_t err = flattenLibraryTable(data, libraryPackages);
if (err != NO_ERROR) {
fprintf(stderr, "ERROR: failed to write library table\n");
return err;
}
}
// Build the type chunks inside of this package.
@@ -2890,6 +2902,7 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>&
continue;
}
const bool filterable = (typeName != mipmap16);
const bool skipEntireType = (typeName == mipmap16 && !isBase);
const size_t N = t != NULL ? t->getOrderedConfigs().size() : 0;
@@ -2927,6 +2940,11 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>&
if (cl->getPublic()) {
typeSpecFlags[ei] |= htodl(ResTable_typeSpec::SPEC_PUBLIC);
}
if (skipEntireType) {
continue;
}
const size_t CN = cl->getEntries().size();
for (size_t ci=0; ci<CN; ci++) {
if (filterable && !filter->match(cl->getEntries().keyAt(ci))) {
@@ -2943,6 +2961,10 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>&
}
}
if (skipEntireType) {
continue;
}
// We need to write one type chunk for each configuration for
// which we have entries in this type.
const size_t NC = t->getUniqueConfigs().size();

6
tools/aapt/ResourceTable.h
View File

@@ -165,7 +165,8 @@ public:
size_t numLocalResources() const;
bool hasResources() const;
sp<AaptFile> flatten(Bundle* bundle, const sp<const ResourceFilter>& filter);
sp<AaptFile> flatten(Bundle* bundle, const sp<const ResourceFilter>& filter,
const bool isBase);
static inline uint32_t makeResId(uint32_t packageId,
uint32_t typeId,
@@ -206,7 +207,8 @@ public:
void addLocalization(const String16& name, const String8& locale, const SourcePos& src);
status_t validateLocalizations(void);
status_t flatten(Bundle* bundle, const sp<const ResourceFilter>& filter, const sp<AaptFile>& dest);
status_t flatten(Bundle* bundle, const sp<const ResourceFilter>& filter,
const sp<AaptFile>& dest, const bool isBase);
status_t flattenLibraryTable(const sp<AaptFile>& dest, const Vector<sp<Package> >& libs);
void writePublicDefinitions(const String16& package, FILE* fp);

35
tools/aapt/tests/ResourceFilter_test.cpp
View File

@@ -126,3 +126,38 @@ TEST(WeakResourceFilterTest, MatchesConfigWithRegion) {
EXPECT_TRUE(filter.match(config));
}
TEST(StrongResourceFilterTest, MatchesDensities) {
ConfigDescription config;
config.density = 160;
config.version = 4;
std::set<ConfigDescription> configs;
configs.insert(config);
StrongResourceFilter filter(configs);
ConfigDescription expectedConfig;
expectedConfig.density = 160;
expectedConfig.version = 4;
ASSERT_TRUE(filter.match(expectedConfig));
}
TEST(StrongResourceFilterTest, MatchOnlyMdpiAndExcludeAllOthers) {
std::set<ConfigDescription> configsToMatch;
ConfigDescription config;
config.density = 160;
config.version = 4;
configsToMatch.insert(config);
std::set<ConfigDescription> configsToNotMatch;
config.density = 480;
configsToNotMatch.insert(config);
AndResourceFilter filter;
filter.addFilter(new InverseResourceFilter(new StrongResourceFilter(configsToNotMatch)));
filter.addFilter(new StrongResourceFilter(configsToMatch));
ConfigDescription expectedConfig;
expectedConfig.density = 160;
expectedConfig.version = 4;
ASSERT_TRUE(filter.match(expectedConfig));
}