summaryrefslogtreecommitdiffstats
path: root/tools/aapt/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r66' into HEADJessica Wagantall2016-09-071-1/+1
|\
| * Add bound checks to utf16_to_utf8Sergio Giro2016-07-211-1/+1
* | AAPT: Build aapt for deviced34d2015-10-271-0/+25
|/
* AAPT: Fix regression in resource versioningAdam Lesinski2015-08-141-1/+2
* ICU format support for pseudolocalizes.Igor Viarheichyk2015-06-251-1/+2
* Remove unused aapt target.Chih-Hung Hsieh2015-05-061-24/+0
* Add a static dependency on libbase.Narayan Kamath2015-04-291-1/+2
* Re-enable -Wall and -Werror that were lost in a mergeColin Cross2015-04-081-1/+1
* resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aospDan Albert2014-11-121-1/+0
|\
| * Move frameworks/base over to libc++.Dan Albert2014-11-121-1/+0
| * resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aospAndreas Gampe2014-10-011-0/+1
| |\
| * \ resolved conflicts for merge of fe50cfd5 to lmp-dev-plus-aospDan Albert2014-10-011-1/+0
| |\ \
| * \ \ resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aospDan Albert2014-09-191-3/+1
| |\ \ \
* | | | | Fix build due to bad mergeAdam Lesinski2014-11-031-1/+0
* | | | | Merge commit '78be0498' into manualmergeAdam Lesinski2014-11-031-37/+21
|\ \ \ \ \
| * | | | | Fix issues that will be present in C++11Adam Lesinski2014-11-031-36/+20
| |/ / / /
* | | | | resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aospAndreas Gampe2014-10-011-0/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Frameworks/base: Fix AAPT warningsAndreas Gampe2014-10-011-0/+2
| | |_|/ | |/| |
* | | | resolved conflicts for merge of fe50cfd5 to lmp-mr1-dev-plus-aospDan Albert2014-10-011-1/+0
|\ \ \ \ | |/ / /
| * | | Use std::sort instead of qsort_r wrapper.Dan Albert2014-10-011-1/+0
| | |/ | |/|
* | | resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aospDan Albert2014-09-191-3/+2
|\ \ \ | |/ / | | / | |/ |/|
| * Clean up makefile cruft.Dan Albert2014-09-111-4/+3
* | Stamp platform version code into app ApksAdam Lesinski2014-08-271-0/+1
* | Include build number in aapt versionAdam Lesinski2014-08-181-0/+8
* | Revert "Include build number in aapt version"Adam Lesinski2014-08-181-1/+0
* | Include build number in aapt versionAdam Lesinski2014-08-181-0/+1
* | Add support for building split APKsAdam Lesinski2014-05-111-63/+127
* | Exclude the host aapt and aidl from PDK build.Ying Wang2014-03-071-2/+2
|/
* Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2013-12-091-1/+2
* Move input library code to frameworks/native.Jeff Brown2013-07-011-6/+5
* Switch to shared libpng/libz dependency.Stephen Hines2013-06-261-3/+5
* Merge "aapt: move qsort_r_compat here as it is sole client"Dima Zavin2013-05-081-1/+2
|\
| * aapt: move qsort_r_compat here as it is sole clientDima Zavin2013-05-071-1/+2
* | libutils clean-upMathias Agopian2013-05-071-0/+1
|/
* Allow compiling aapt for the deviceBjorn Bringert2013-04-261-5/+38
* Add liblogYing Wang2013-04-091-2/+2
* Cache resource ID lookups in aaptChristopher Tate2012-11-271-0/+1
* Fix aapt to get expat header files from the approved location.Elliott Hughes2012-09-091-1/+0
* am c9fe6568: am 9e22d9c5: Merge "Fix "Too many open files" error for aapt bui...Jean-Baptiste Queru2012-06-051-0/+4
|\
| * Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.Ying Wang2012-06-051-0/+4
* | another attempt at fixing the linux buildMathias Agopian2012-02-211-1/+1
* | frameworks/base refactoringMathias Agopian2012-02-201-0/+1
|/
* add -ldl to host executablesIliyan Malchev2011-10-201-1/+1
* New aapt feature to do smarter filtering of configurations.Dianne Hackborn2011-10-161-0/+1
* Added Caching for PreProcessed PNGsJosiah Gaskin2011-07-201-0/+2
* Fix build on some linux machineshmepas2010-08-111-1/+1
* The aapt and aidl tools are prebuilt when we're doing an apps-only build, so ...Joe Onorato2010-06-101-0/+4
* Fix aapt to build in Windows SDK under LinuxRaphael2010-04-231-6/+6
* break dependency on utils/ZipEntry.h and utils/ZipFile.h, get rid of inet_add...Mathias Agopian2009-06-051-1/+4
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+52