Xavier Ducrohet b7de2194d5 resolved conflicts for merge of c71c678e to master ...

Change-Id: I9e1a6a1151af00f0a13e2010776276b240e0ac3a

2013-01-15 16:41:29 -08:00

..

tests

…

AaptAssets.cpp

Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources

2012-09-06 11:13:24 -07:00

AaptAssets.h

Add support for "-rtl" in resources

2012-08-23 14:55:33 -07:00

Android.mk

Cache resource ID lookups in aapt

2012-11-28 15:32:46 -08:00

Bundle.h

Add single crunch command to aapt. do not merge.

2013-01-02 15:41:52 -08:00

CacheUpdater.h

…

Command.cpp

resolved conflicts for merge of c71c678e to master

2013-01-15 16:41:29 -08:00

CrunchCache.cpp

…

CrunchCache.h

…

DirectoryWalker.h

…

FileFinder.cpp

…

FileFinder.h

…

Images.cpp

Embed layout padding in nine patch images

2012-04-04 12:05:59 -07:00

Images.h

aapt: Preprocess images in parallel.

2012-03-17 14:12:57 -07:00

Main.cpp

Add single crunch command to aapt. do not merge.

2013-01-02 15:41:52 -08:00

Main.h

Add single crunch command to aapt. do not merge.

2013-01-02 15:41:52 -08:00

NOTICE

…

Package.cpp

…

printapk.cpp

…

Resource.cpp

Fix writing text version of styleable IDs. do not merge.

2012-09-26 11:14:50 -07:00

ResourceFilter.cpp

…

ResourceFilter.h

…

ResourceIdCache.cpp

Cache resource ID lookups in aapt

2012-11-28 15:32:46 -08:00

ResourceIdCache.h

Cache resource ID lookups in aapt

2012-11-28 15:32:46 -08:00

ResourceTable.cpp

Cache resource ID lookups in aapt

2012-11-28 15:32:46 -08:00

ResourceTable.h

aapt now sorts the strings in the resource string pool.

2012-01-31 15:41:30 -08:00

SourcePos.cpp

…

SourcePos.h

…

StringPool.cpp

Use qsort_r_compat() as a portable wrapper for qsort_r().

2012-03-19 14:08:58 -07:00

StringPool.h

Fix aapt to get expat header files from the approved location.

2012-09-09 14:45:32 -07:00

XMLNode.cpp

Merge "Normalize output from aapt d xmltree"

2012-08-08 11:21:29 -07:00

XMLNode.h

…

ZipEntry.cpp

Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)

2012-01-19 14:44:59 -08:00

ZipEntry.h

…

ZipFile.cpp

frameworks/base: move Zip* from libandroidfw to libutils

2012-03-22 18:43:07 -07:00

ZipFile.h

…