Adam Lesinski f45d2fad2e AAPT: Fix resource versioning ...

Resource generation was greedy, so when an attribute with sdk level 21 was used in a resource
with v1, and a different attribute with sdk level 21 was used in a resource with v11,
a v21 resource would be synthesized, but it would contain the attribute from v1 instead of v11.

This change fixes the issue, having the higher versioned resource take precedence.

Bug:22793816
Change-Id: Ia687f56b0d9969e424111477d55d9804255b22e9

2015-07-28 12:26:57 -07:00

..

tests

ICU format support for pseudolocalizes.

2015-06-25 09:49:43 +01:00

AaptAssets.cpp

Output modified bcp47 tag in ResTable_config::toString()

2015-03-16 22:25:26 +00:00

AaptAssets.h

Output modified bcp47 tag in ResTable_config::toString()

2015-03-16 22:25:26 +00:00

AaptConfig.cpp

Add -round and -notround qualifier to android runtime/aapt

2015-05-15 15:10:58 -07:00

AaptConfig.h

Add -round and -notround qualifier to android runtime/aapt

2015-05-15 15:10:58 -07:00

AaptUtil.cpp

Add support for building split APKs

2014-05-11 18:30:12 -07:00

AaptUtil.h

Build the split-select tool without C++11 support

2014-11-03 12:09:58 -08:00

AaptXml.cpp

Add appropriate casts for char16_t.

2014-11-20 11:47:40 -08:00

AaptXml.h

Stamp platform version code into app Apks

2014-08-27 18:28:49 -07:00

Android.mk

ICU format support for pseudolocalizes.

2015-06-25 09:49:43 +01:00

ApkBuilder.cpp

Ensure that split names are valid

2014-08-14 19:29:47 +00:00

ApkBuilder.h

Ensure that split names are valid

2014-08-14 19:29:47 +00:00

Bundle.h

aapt: add option for stricter symbol generation

2015-06-02 02:55:52 +00:00

CacheUpdater.h

Fix automerge issue

2014-11-03 20:35:54 -08:00

Command.cpp

am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev

2015-02-10 20:14:44 +00:00

ConfigDescription.h

First commit of split-select tool

2014-10-23 10:39:31 -07:00

CrunchCache.cpp

Frameworks/base: Fix AAPT warnings

2014-10-01 16:18:06 -07:00

CrunchCache.h

…

DirectoryWalker.h

…

FileFinder.cpp

…

FileFinder.h

…

Images.cpp

Re-enable -Wall and -Werror that were lost in a merge

2015-04-08 17:48:23 -07:00

Images.h

AAPT: Continuation of public/private attribute fix

2014-09-22 10:51:20 -07:00

IndentPrinter.h

Have R classes generate their own reference rewrite logic

2014-08-25 20:04:07 -07:00

Main.cpp

aapt: add option for stricter symbol generation

2015-06-02 02:55:52 +00:00

Main.h

Added a daemon mode to aapt to receive streams of commands from gradle.

2014-10-02 15:43:55 -07:00

NOTICE

…

OutputSet.h

Add support for building split APKs

2014-05-11 18:30:12 -07:00

Package.cpp

resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aosp

2014-10-01 23:35:41 -07:00

pseudolocalize.cpp

ICU format support for pseudolocalizes.

2015-06-25 09:49:43 +01:00

pseudolocalize.h

ICU format support for pseudolocalizes.

2015-06-25 09:49:43 +01:00

Resource.cpp

aapt: add option for stricter symbol generation

2015-06-02 02:55:52 +00:00

ResourceFilter.cpp

AAPT: Ignore densities specified in -c flag

2014-11-10 17:56:11 -08:00

ResourceFilter.h

AAPT: Filtering resource fix

2014-08-22 16:09:54 -07:00

ResourceIdCache.cpp

First commit of split-select tool

2014-10-23 10:39:31 -07:00

ResourceIdCache.h

Shared library resource support

2014-03-25 12:09:56 -07:00

ResourceTable.cpp

AAPT: Fix resource versioning

2015-07-28 12:26:57 -07:00

ResourceTable.h

aapt: add option for stricter symbol generation

2015-06-02 02:55:52 +00:00

SdkConstants.h

Add -round and -notround qualifier to android runtime/aapt

2015-05-15 15:10:58 -07:00

SourcePos.cpp

Add error checking to aapt for split generation

2014-11-03 15:55:44 -08:00

SourcePos.h

Add error checking to aapt for split generation

2014-11-03 15:55:44 -08:00

StringPool.cpp

Only Windows doesn't have %zd.

2015-04-03 12:56:45 -07:00

StringPool.h

Merge commit '78be0498' into manualmerge

2014-11-03 18:06:22 -08:00

Symbol.h

Add error checking to aapt for split generation

2014-11-03 15:55:44 -08:00

WorkQueue.cpp

…

WorkQueue.h

…

XMLNode.cpp

ICU format support for pseudolocalizes.

2015-06-25 09:49:43 +01:00

XMLNode.h

AAPT: Continuation of public/private attribute fix

2014-09-22 10:51:20 -07:00

ZipEntry.cpp

kill HAVE_LOCALTIME_R

2014-11-13 09:57:22 -08:00

ZipEntry.h

Frameworks/base: Fix AAPT warnings

2014-10-01 16:18:06 -07:00

ZipFile.cpp

Frameworks/base: Fix AAPT warnings

2014-10-01 16:18:06 -07:00

ZipFile.h

…