Adam Lesinski 685d363d7a Merge commit 'fb96e54' into manualmerge ...

Conflicts:
	tools/aapt/Resource.cpp

Change-Id: I4147c3550e9426f3429146eaeb16f10ba76b5b15

2014-11-05 12:30:25 -08: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

Add error checking to aapt for split generation

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

Fix issues that will be present in C++11

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

AaptXml.h

…

Android.mk

Fix build due to bad merge

2014-11-03 18:37:49 -08:00

ApkBuilder.cpp

…

ApkBuilder.h

…

Bundle.h

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

2014-10-02 15:43:55 -07: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

…

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

…

IndentPrinter.h

…

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

…

Package.cpp

…

printapk.cpp

…

pseudolocalize.cpp

…

pseudolocalize.h

…

Resource.cpp

Merge commit 'fb96e54' into manualmerge

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

ResourceFilter.cpp

…

ResourceFilter.h

…

ResourceIdCache.cpp

First commit of split-select tool

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

ResourceIdCache.h

…

ResourceTable.cpp

Merge commit 'fb96e54' into manualmerge

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

ResourceTable.h

Add error checking to aapt for split generation

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

…

ZipEntry.cpp

…

ZipEntry.h

…

ZipFile.cpp

…

ZipFile.h

…