Adam Lesinski 4d29c66930 Merge commit 'fa31eb2c' into manualmerge ...

Conflicts:
	tools/split-select/RuleGenerator_test.cpp

Change-Id: I0d1261301d433f32e857cf1b0d75a861205f7625

2014-11-10 14:32:11 -08:00

..

tests

AAPT: Filtering resource fix

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

AaptAssets.cpp

Merge commit 'cd8442d4' into manualmerge

2014-10-23 14:55:57 -07:00

AaptAssets.h

First commit of split-select tool

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

AaptConfig.cpp

split-select: Fix rules generated for anydpi density

2014-11-06 14:57:34 -08:00

AaptConfig.h

Add error checking to aapt for split generation

2014-11-03 15:55:44 -08: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

Fix issues that will be present in C++11

2014-11-03 11:49:47 -08:00

AaptXml.h

Stamp platform version code into app Apks

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

Android.mk

Fix build due to bad merge

2014-11-03 18:37:49 -08: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

split-select: Fix rules generated for anydpi density

2014-11-06 14:57:34 -08:00

CacheUpdater.h

Fix automerge issue

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

Command.cpp

Merge "aapt updates for Android TV" into lmp-mr1-dev automerge: 6af7d76

2014-10-24 21:24:59 +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

am dd64fc43: am effd416e: am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev

2014-10-17 23:12:28 +00: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

Fix issues that will be present in C++11

2014-11-03 11:49:47 -08: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-mr1-dev-plus-aosp

2014-10-01 23:26:06 -07:00

printapk.cpp

Shared library resource support

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

pseudolocalize.cpp

Fix warning introduced by recent psuedolocalizer change.

2014-04-18 16:15:27 -07:00

pseudolocalize.h

Pseudolocalizer improvements.

2014-04-09 16:59:48 -07:00

Resource.cpp

Merge commit 'fb96e54' into manualmerge

2014-11-05 12:30:25 -08:00

ResourceFilter.cpp

AAPT: Filtering resource fix

2014-08-22 16:09:54 -07: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

Merge commit 'fa31eb2c' into manualmerge

2014-11-10 14:32:11 -08:00

ResourceTable.h

Add error checking to aapt for split generation

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

SdkConstants.h

split-select: Fix rules generated for anydpi density

2014-11-06 14:57:34 -08: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

Merge commit '78be0498' into manualmerge

2014-11-03 18:06:22 -08: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

Fix issues that will be present in C++11

2014-11-03 11:49:47 -08:00

XMLNode.h

AAPT: Continuation of public/private attribute fix

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

ZipEntry.cpp

Frameworks/base: Fix AAPT warnings

2014-10-01 16:18:06 -07: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

…