summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ /
| * | | am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."Narayan Kamath2014-02-178-224/+522
| |\ \ \ | | | |/ | | |/|
| | * | Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-148-224/+522
* | | | Add --replace-version flag to aapt.Jeff Davidson2014-02-253-11/+45
* | | | Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-108-224/+522
* | | | resolved conflicts for merge of 1b5b60d6 to masterAdam Lesinski2014-02-045-26/+38
|\ \ \ \ | |/ / /
| * | | am 203356a3: Merge "Add support for multiple asset dirs (-A)" into klp-modula...Adam Lesinski2014-02-045-25/+38
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge "Add support for multiple asset dirs (-A)" into klp-modular-devAdam Lesinski2014-02-045-25/+38
| | |\
| | | * Add support for multiple asset dirs (-A)Adam Lesinski2014-01-235-25/+38
| * | | Change ResourceType cookies to int32_t.Narayan Kamath2014-01-312-3/+2
| |/ /
| * | AssetManager cookies should be int32_t and not void*.Narayan Kamath2014-01-271-1/+1
| |/
| * Merge "Don't pseudolocalize untranslatable strings."Narayan Kamath2013-12-181-5/+13
| |\
| | * Don't pseudolocalize untranslatable strings.Narayan Kamath2013-12-101-5/+13
| * | Merge "Reimplement ZipFileRO in terms of libziparchive."Narayan Kamath2013-12-111-1/+2
| |\ \
| | * | Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2013-12-091-1/+2
| | |/
| | * Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEADThe Android Open Source Project2013-11-2215-67/+972
| | |\
| * | \ am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."Elliott Hughes2013-10-292-33/+32
| |\ \ \ | | |/ /
| | * | Fix a variety of small publicly-reported bugs.Elliott Hughes2013-10-292-33/+32
| * | | am 16e8c4f7: am 7d292145: Merge "Prune unneeded density resources from APK" i...Adam Lesinski2013-10-181-1/+38
| |\ \ \ | | |_|/ | |/| |
| | * | Prune unneeded density resources from APKAdam Lesinski2013-10-151-1/+38
| * | | am ea4e0751: am c884fc9f: Merge "AAPT emits error for res with no \'default\'...Adam Lesinski2013-10-071-4/+65
| |\ \ \ | | |/ /
| | * | AAPT emits error for res with no 'default' productAdam Lesinski2013-10-041-4/+65
| * | | am 0c923b7c: Merge "Add badging of Payment apps" into klp-devAdam Lesinski2013-09-301-11/+142
| |\ \ \ | | |/ /
| | * | Add badging of Payment appsAdam Lesinski2013-09-271-11/+142
| * | | am 5223a5ff: Merge "Add support for dumping new badging" into klp-devAdam Lesinski2013-09-301-3/+68
| |\ \ \ | | |/ /
| | * | Add support for dumping new badgingAdam Lesinski2013-09-271-3/+68
| * | | am 86974463: Merge "Added support for supports-input manifest element" into k...Michael Wright2013-09-051-50/+87
| |\ \ \ | | |/ /
| | * | Added support for supports-input manifest elementMichael Wright2013-09-051-50/+87
| * | | am 49ee555f: Merge "Transition API changes from API council recommendations" ...Chet Haase2013-09-041-26/+1
| |\ \ \ | | |/ /
| | * | Transition API changes from API council recommendationsChet Haase2013-09-041-26/+1
| * | | am adae1e91: am 1b8c33c6: Merge "Forward compatibility fixes"Victoria Lease2013-08-271-11/+16
| |\ \ \ | | |/ / | |/| / | | |/
| | * Forward compatibility fixesJohn Reck2013-08-261-11/+16
* | | Change ResourceType cookies to int32_t.Narayan Kamath2014-01-282-2/+2
* | | AssetManager cookies are now int32_t, not void*.Narayan Kamath2014-01-271-1/+1
* | | Filter unneeded assets from additional resource directoriesBryan Mawhinney2014-01-271-0/+3
* | | Don't pseudolocalize untranslatable strings.Narayan Kamath2014-01-271-5/+13
* | | Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2014-01-271-1/+2
* | | Add new aapt flag --error-on-missing-config-entryYing Wang2014-01-273-3/+19
* | | Dump maxSdk of uses-permission during badgingAdam Lesinski2014-01-271-30/+46