Dianne Hackborn 58520b24d4 resolved conflicts for merge of 10d5b096 to master ...

Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7

2010-10-04 14:54:59 -07:00

..

tests/plurals

…

AaptAssets.cpp

Add --max-res-version flag to aapt.

2010-08-13 14:32:05 -07:00

AaptAssets.h

Fix issue #2448075: aapt doesn't fix up activity-alias android:targetActivity links

2010-03-01 20:42:14 -08:00

Android.mk

Fix linux 64 build

2010-08-24 20:20:50 -07:00

Bundle.h

Add an aapt option to allow string variations for different devices.

2010-09-23 10:32:47 -07:00

Command.cpp

am 31103928: am 192b56d4: Merge "Implement #2964234: Add support for <uses-package> element to aapt" into gingerbread

2010-09-02 17:59:51 -07:00

Images.cpp

Give an 9-patch error on too many rows and columns

2010-03-12 14:12:14 -08:00

Images.h

…

Main.cpp

Add an aapt option to allow string variations for different devices.

2010-09-23 10:32:47 -07:00

Main.h

Add a flag (-G) to aapt to have it output the classes that shouldn't be obfuscated by ProGuard.

2009-08-30 16:51:29 -07:00

Package.cpp

Fixes a few minor problems with AAPT

2010-06-25 11:02:15 +01:00

printapk.cpp

…

Resource.cpp

am fa888784: am 89fef418: Merge "Avoid pre-processing images when they won\'t be used"

2010-09-10 15:01:56 -07:00

ResourceTable.cpp

resolved conflicts for merge of 10d5b096 to master

2010-10-04 14:54:59 -07:00

ResourceTable.h

Revert "Dedupe resource config pointers"

2010-03-10 11:38:05 -08:00

SourcePos.cpp

Format aapt warnings the same way as other compiler warnings

2009-07-13 14:14:01 -07:00

SourcePos.h

…

StringPool.cpp

Fixes a few minor problems with AAPT

2010-06-25 11:02:15 +01:00

StringPool.h

Optional use of UTF-8 strings in resource bundles

2009-12-07 15:14:15 -08:00

XMLNode.cpp

am d22a1e89: am 244152bf: Merge "Change aapt\'s warning message to suggest formatted="false", not "true"." into gingerbread

2010-08-16 07:49:51 -07:00

XMLNode.h

Add error checking for translatable strings

2010-06-03 09:33:43 -07:00

ZipEntry.cpp

Format aapt warnings the same way as other compiler warnings

2009-07-13 14:14:01 -07:00

ZipEntry.h

Add LFH offset to verbose list of APK

2010-08-25 07:38:33 -07:00

ZipFile.cpp

break dependency on utils/ZipEntry.h and utils/ZipFile.h, get rid of inet_address.h and Socket.h which were not used

2009-06-05 14:56:35 -07:00

ZipFile.h

Fixes a few minor problems with AAPT

2010-06-25 11:02:15 +01:00