Adam Lesinski e03f2cb2c2 Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev automerge: b443610 ...

automerge: 83f58a2

* commit '83f58a2f7afac98199536b3090fe6f767ffb3a0d':
  AAPT: Use the right enum when checking for density configurations

2015-01-23 02:46:32 +00:00

..

tests

…

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

AAPT: Use the right enum when checking for density configurations

2015-01-22 18:19:44 -08:00

AaptConfig.h

Add error checking to aapt for split generation

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

AaptUtil.cpp

…

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

…

Android.mk

resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp

2014-11-12 13:24:42 -08:00

ApkBuilder.cpp

…

ApkBuilder.h

…

Bundle.h

AAPT: Copy android:revisionCode to Splits

2014-12-16 09:16:26 -08:00

CacheUpdater.h

Fix automerge issue

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

Command.cpp

am c765655a: am fbba9b57: Merge "AAPT: Dump status of required flag for uses-feature" into lmp-mr1-dev

2014-12-09 00:43:14 +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

…

Main.cpp

am c04a21a0: Merge "Fixup aapt usage message" automerge: 64044d0

2015-01-08 20:24:33 +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

…

Package.cpp

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

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

printapk.cpp

…

pseudolocalize.cpp

…

pseudolocalize.h

…

Resource.cpp

am 503a4494: am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev

2014-12-16 18:02:09 +00:00

ResourceFilter.cpp

AAPT: Ignore densities specified in -c flag

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

ResourceFilter.h

…

ResourceIdCache.cpp

First commit of split-select tool

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

ResourceIdCache.h

…

ResourceTable.cpp

am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev

2015-01-14 20:47:47 +00:00

ResourceTable.h

AAPT: Handle all old unversioned attribute usage

2015-01-14 12:02:15 -08:00

SdkConstants.h

AAPT: Handle all old unversioned attribute usage

2015-01-14 12:02:15 -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

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

…