Merge "AAPT: mipmaps should not end up in Splits" into lmp-dev (628f670a) · Commits · e / os / android_frameworks_base

tools/aapt/Resource.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -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());

tools/aapt/ResourceTable.cpp

+29 −7

Original line number	Diff line number	Diff line
		@@ -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,11 +2881,13 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>&
		return amt;
		}

		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.
		for (size_t ti=0; ti<N; ti++) {
		@@ -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();

tools/aapt/ResourceTable.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -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);

tools/aapt/tests/ResourceFilter_test.cpp

+35 −0

Original line number	Diff line number	Diff line
		@@ -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));
		}