From 914f7e683a01f15f8830810c49eaecc31bc554a6 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Tue, 27 Sep 2011 16:09:41 -0700 Subject: Don't lose product variant strings that also vary between locales. Localized strings with product variants were not being included in the APK, apparently because the check to ensure that a different variation of the string had not already been included in the APK was matching the version of it from the default, untranslated configuration. Now check to make sure that the string not only exists but also exists in the correct configuration. Bug 5372711 Change-Id: I52975570b75e0f11827dc6bcf1cb4a987d0541aa --- tools/aapt/ResourceTable.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tools/aapt/ResourceTable.h') diff --git a/tools/aapt/ResourceTable.h b/tools/aapt/ResourceTable.h index 734c541f9b61..80f2192da4f6 100644 --- a/tools/aapt/ResourceTable.h +++ b/tools/aapt/ResourceTable.h @@ -124,6 +124,11 @@ public: const String16& type, const String16& name) const; + bool hasBagOrEntry(const String16& package, + const String16& type, + const String16& name, + const ResTable_config& config) const; + bool hasBagOrEntry(const String16& ref, const String16* defType = NULL, const String16* defPackage = NULL); -- cgit v1.2.3-59-g8ed1b