Adam Lesinski 8ee244355b resolved conflicts for merge of 522c5ce2 to master ...

Change-Id: I15c7f78e9c81947e33270251d7b50e592fb61583

2014-06-03 13:47:54 -07:00

..

tests

Add support for building split APKs

2014-05-11 18:30:12 -07:00

AaptAssets.cpp

Add support for building split APKs

2014-05-11 18:30:12 -07:00

AaptAssets.h

Add support for building split APKs

2014-05-11 18:30:12 -07:00

AaptConfig.cpp

Add support for building split APKs

2014-05-11 18:30:12 -07:00

AaptConfig.h

Add support for building split APKs

2014-05-11 18:30:12 -07:00

AaptUtil.cpp

Add support for building split APKs

2014-05-11 18:30:12 -07:00

AaptUtil.h

Add support for building split APKs

2014-05-11 18:30:12 -07:00

Android.mk

Add support for building split APKs

2014-05-11 18:30:12 -07:00

ApkBuilder.cpp

Add support for building split APKs

2014-05-11 18:30:12 -07:00

ApkBuilder.h

Quick fix to ensure mipmap doesn't get stripped by AAPT

2014-05-13 10:57:53 -07:00

Bundle.h

Add support for building split APKs

2014-05-11 18:30:12 -07:00

CacheUpdater.h

…

Command.cpp

Don't dump data from a bad ResTable

2014-05-19 15:01:43 -07:00

ConfigDescription.h

Add support for building split APKs

2014-05-11 18:30:12 -07:00

CrunchCache.cpp

…

CrunchCache.h

…

DirectoryWalker.h

…

FileFinder.cpp

…

FileFinder.h

…

Images.cpp

…

Images.h

…

Main.cpp

resolved conflicts for merge of 522c5ce2 to master

2014-06-03 13:47:54 -07:00

Main.h

Add support for building split APKs

2014-05-11 18:30:12 -07:00

NOTICE

…

OutputSet.h

Add support for building split APKs

2014-05-11 18:30:12 -07:00

Package.cpp

Add support for building split APKs

2014-05-11 18:30:12 -07:00

printapk.cpp

…

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

qsort_r_compat.c

…

qsort_r_compat.h

…

Resource.cpp

Add support for building split APKs

2014-05-11 18:30:12 -07:00

ResourceFilter.cpp

Add support for building split APKs

2014-05-11 18:30:12 -07:00

ResourceFilter.h

Add support for building split APKs

2014-05-11 18:30:12 -07:00

ResourceIdCache.cpp

…

ResourceIdCache.h

…

ResourceTable.cpp

Merge "Add support for building split APKs"

2014-05-12 18:12:35 +00:00

ResourceTable.h

Add support for building split APKs

2014-05-11 18:30:12 -07:00

SourcePos.cpp

…

SourcePos.h

…

StringPool.cpp

Don't dump data from a bad ResTable

2014-05-19 15:01:43 -07:00

StringPool.h

…

WorkQueue.cpp

…

WorkQueue.h

…

XMLNode.cpp

Pseudolocalizer improvements.

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

XMLNode.h

Pseudolocalizer improvements.

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

ZipEntry.cpp

…

ZipEntry.h

…

ZipFile.cpp

…

ZipFile.h

…