Roozbeh Pournader 3f32c27ccf Don't match locales with different scripts in ResourceFilter ...

Previously, AAPT would match locales even if they had different
explicit scripts if the requested locale was just a languages. Now
we require explicit listing of the languages with different explicit
scripts in order for the locale to be included.

Bug: 29412034
Change-Id: Ia118a5a7f9aec49f6c3c53b9195a0ae1a57f53fd

2016-06-21 15:03:51 -07:00

..

tests

…

AaptAssets.cpp

Removing assignments to localeScriptWasComputed in aapt.

2016-03-30 20:24:48 -04:00

AaptAssets.h

…

AaptConfig.cpp

…

AaptConfig.h

…

AaptUtil.cpp

…

AaptUtil.h

…

AaptXml.cpp

…

AaptXml.h

…

Android.mk

…

ApkBuilder.cpp

…

ApkBuilder.h

…

Bundle.h

AAPT: ProGuard config for components in main dex.

2016-04-27 19:50:55 +00:00

CacheUpdater.h

…

Command.cpp

AAPT: ProGuard config for components in main dex.

2016-04-27 19:50:55 +00:00

ConfigDescription.h

…

CrunchCache.cpp

…

CrunchCache.h

…

DirectoryWalker.h

…

FileFinder.cpp

…

FileFinder.h

…

Images.cpp

Work-around paletted image decoding bug in SDK_JELLYBEAN

2016-03-16 18:36:06 -04:00

Images.h

…

IndentPrinter.h

…

Main.cpp

AAPT: ProGuard config for components in main dex.

2016-04-27 19:50:55 +00:00

Main.h

AAPT: ProGuard config for components in main dex.

2016-04-27 19:50:55 +00:00

NOTICE

…

OutputSet.h

…

Package.cpp

Don't try to compress .mkv resources

2016-04-04 15:39:40 +09:00

pseudolocalize.cpp

…

pseudolocalize.h

Track rename from base/ to android-base/.

2015-12-04 15:33:35 -08:00

Resource.cpp

Stop emitting javadoc for @removed attributes.

2016-05-09 14:51:41 +01:00

ResourceFilter.cpp

Don't match locales with different scripts in ResourceFilter

2016-06-21 15:03:51 -07:00

ResourceFilter.h

…

ResourceIdCache.cpp

…

ResourceIdCache.h

…

ResourceTable.cpp

AAPT: Allow duplicate attribute definitions if identical

2016-02-26 15:57:59 -08:00

ResourceTable.h

AAPT: Allow duplicate attribute definitions if identical

2016-02-26 15:57:59 -08:00

SdkConstants.h

…

SourcePos.cpp

…

SourcePos.h

…

StringPool.cpp

…

StringPool.h

…

Symbol.h

…

WorkQueue.cpp

…

WorkQueue.h

…

XMLNode.cpp

Implement AAPT Bundle format

2015-11-30 14:43:43 -08:00

XMLNode.h

Implement AAPT Bundle format

2015-11-30 14:43:43 -08:00

ZipEntry.cpp

…

ZipEntry.h

…

ZipFile.cpp

…

ZipFile.h

…