summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Expand)AuthorAgeFilesLines
...
* Support multiple resource tables with same packageAdam Lesinski2014-06-182-8/+19
* Merge "Add support for @SystemApi annotation to aapt."Jeff Brown2014-06-091-37/+44
|\
| * Add support for @SystemApi annotation to aapt.Jeff Brown2014-06-061-37/+44
* | am 99017c01: Merge "Fix issue preventing aapt from stripping all unwanted den...Bryan Mawhinney2014-06-091-2/+2
|\ \ | |/ |/|
| * Fix issue preventing aapt from stripping all unwanted densitiesBryan Mawhinney2014-06-061-2/+2
* | resolved conflicts for merge of 522c5ce2 to masterAdam Lesinski2014-06-031-8/+4
|\ \ | |/ |/|
| * am 7e547e0d: Merge "Add --pseudo-localize option to generate resources for ps...Adam Lesinski2014-06-031-5/+4
| |\
| | * Add --pseudo-localize option to generate resources for pseudolocales.Igor Viarheichyk2014-06-031-5/+4
* | | Don't dump data from a bad ResTableAdam Lesinski2014-05-192-0/+11
* | | Merge "AAPT dump badging should allow refs in meta-data"Adam Lesinski2014-05-151-1/+1
|\ \ \
| * | | AAPT dump badging should allow refs in meta-dataAdam Lesinski2014-05-151-1/+1
* | | | Merge "Fix crash in AAPT dump badging with bad StringPool"Adam Lesinski2014-05-151-7/+38
|\ \ \ \
| * | | | Fix crash in AAPT dump badging with bad StringPoolAdam Lesinski2014-05-151-7/+38
| |/ / /
* | | | Quick fix to ensure mipmap doesn't get stripped by AAPTAdam Lesinski2014-05-132-3/+18
|/ / /
* | | Merge "Add support for building split APKs"Adam Lesinski2014-05-1225-1889/+2236
|\ \ \
| * | | Add support for building split APKsAdam Lesinski2014-05-1125-1893/+2241
* | | | am 86768034: am b593ad60: am f1f28d1d: Merge "Skip resource files for locales...Elliott Hughes2014-05-061-0/+15
|\ \ \ \ | | |/ / | |/| |
| * | | am b593ad60: am f1f28d1d: Merge "Skip resource files for locales en-XA and ar...Elliott Hughes2014-05-061-0/+15
| |\ \ \ | | | |/ | | |/|
| | * | Skip resource files for locales en-XA and ar-XBIgor Viarheichyk2014-05-051-0/+15
* | | | am 0472fb58: am 34dd2cdd: am f2d2c871: AAPT should not process XML that faile...Adam Lesinski2014-05-051-4/+5
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | am 34dd2cdd: am f2d2c871: AAPT should not process XML that failed to compileAdam Lesinski2014-05-051-4/+5
| |\ \
| | * \ am f2d2c871: AAPT should not process XML that failed to compileAdam Lesinski2014-05-051-4/+5
| | |\ \
| | | * | AAPT should not process XML that failed to compileAdam Lesinski2014-05-051-4/+5
* | | | | am fd955f14: am 6a6979ad: am 86315c45: Merge "Fixes issue causing pseudolocal...Elliott Hughes2014-04-301-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 6a6979ad: am 86315c45: Merge "Fixes issue causing pseudolocalization of st...Elliott Hughes2014-04-301-2/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fixes issue causing pseudolocalization of stringsIgor Viarheichyk2014-04-301-2/+1
* | | | | Child nodes of <preference-headers> now output proguard keep options.Adam Lesinski2014-04-251-7/+12
* | | | | am 36e64ab9: am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recen...Elliott Hughes2014-04-181-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recent psuedolocal...Elliott Hughes2014-04-181-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Fix warning introduced by recent psuedolocalizer change.Elliott Hughes2014-04-181-1/+1
* | | | | resolved conflicts for merge of 56ca8219 to masterElliott Hughes2014-04-189-104/+335
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of ec42199a to klp-modular-dev-plus-aospElliott Hughes2014-04-189-104/+335
| |\ \ \ \ | | |/ / /
| | * | | Pseudolocalizer improvements.Anton Krumin2014-04-099-105/+336
* | | | | am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifi...John Spurlock2014-04-041-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp...John Spurlock2014-04-041-0/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Introduce new UI_MODE_TYPE_WATCH and qualifier.John Spurlock2014-04-041-0/+5
| * | | | am 004ceaaa: am 55a65509: Merge "Reduce warning verbosity in aapt"Adam Lesinski2014-03-274-92/+98
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Reduce warning verbosity in aaptAdam Lesinski2014-03-244-92/+98
* | | | | Shared library resource supportAdam Lesinski2014-03-259-19/+95
* | | | | Reduce warning verbosity in aaptAdam Lesinski2014-03-204-92/+98
* | | | | resolved conflicts for merge of 92860a74 to masterNarayan Kamath2014-03-101-52/+28
|\ \ \ \ \ | |/ / / /
| * | | | am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-101-50/+25
| |\ \ \ \ | | |/ / /
| | * | | LP64: Make 9 patches architecture agnostic.Narayan Kamath2014-03-101-50/+25
* | | | | resolved conflicts for merge of a81ee86b to masterTim Kilbourn2014-03-071-9/+34
|\ \ \ \ \ | |/ / / /
| * | | | am b559b371: Merge "Dump leanback info in aapt dump badging." into klp-modula...Tim Kilbourn2014-03-081-8/+32
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Dump leanback info in aapt dump badging." into klp-modular-devTim Kilbourn2014-03-081-8/+32
| | |\ \ \
| | | * | | Dump leanback info in aapt dump badging.Tim Kilbourn2014-03-071-8/+32
* | | | | | am 71364f8c: am f5f4d930: am 74bebf6f: Exclude the host aapt and aidl from PD...Ying Wang2014-03-081-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 74bebf6f: Exclude the host aapt and aidl from PDK build.Ying Wang2014-03-081-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Exclude the host aapt and aidl from PDK build.Ying Wang2014-03-071-2/+2
| | |/ / /