summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Expand)AuthorAgeFilesLines
* am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues"Andreas Gampe2014-10-024-30/+51
|\
| * Frameworks/base: Fix more aapt issuesAndreas Gampe2014-10-014-30/+51
* | resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aospAndreas Gampe2014-10-0113-387/+540
|\ \ | |/
| * Frameworks/base: Fix AAPT warningsAndreas Gampe2014-10-0114-389/+527
* | am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-devStephen Hines2014-10-011-0/+3
|\ \
| * | include direct.h for _mkdirAndrew Hsieh2014-09-301-0/+3
* | | resolved conflicts for merge of fe50cfd5 to lmp-dev-plus-aospDan Albert2014-10-015-142/+22
|\ \ \ | | |/ | |/|
| * | Use std::sort instead of qsort_r wrapper.Dan Albert2014-10-015-142/+22
* | | am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually sh...Adam Lesinski2014-09-262-1/+19
|\ \ \ | | |/ | |/|
| * | AAPT: Fix issue with synthesized resource not actually showing upAdam Lesinski2014-09-242-1/+19
* | | am 36b5795f: am 81745c51: Merge "AAPT: Continuation of public/private attribu...Adam Lesinski2014-09-229-36/+316
|\ \ \ | |/ /
| * | AAPT: Continuation of public/private attribute fixAdam Lesinski2014-09-229-36/+316
* | | resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aospDan Albert2014-09-191-3/+1
|\ \ \ | | |/ | |/|
| * | Clean up makefile cruft.Dan Albert2014-09-111-4/+3
* | | am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT publi...Adam Lesinski2014-09-193-3/+225
|\ \ \ | | |/ | |/|
| * | Fix backwards compat problem with AAPT public attrsAdam Lesinski2014-09-183-3/+225
* | | am 972628dc: am 5128e88e: Merge "Don\'t use reflection when generating the on...Marcin Kosiba2014-09-112-104/+73
|\ \ \ | |/ /
| * | Merge "Don't use reflection when generating the onResourcesLoaded callback." ...Marcin Kosiba2014-09-112-104/+73
| |\ \
| | * | Don't use reflection when generating the onResourcesLoaded callback.Marcin Kosiba2014-09-112-104/+73
* | | | am 716c7279: am 799dc748: Merge "AAPT: Don\'t crash on illegal symbol name" i...Adam Lesinski2014-09-101-2/+6
|\ \ \ \ | |/ / /
| * | | AAPT: Don't crash on illegal symbol nameAdam Lesinski2014-09-091-2/+6
| |/ /
* | | resolved conflicts for merge of 1d99636f to lmp-dev-plus-aospDan Albert2014-09-091-10/+3
|\ \ \ | | |/ | |/|
| * | Merge "Don't check for null references."Dan Albert2014-09-091-11/+2
| |\ \
| | * | Don't check for null references.Dan Albert2014-09-081-11/+2
* | | | resolved conflicts for merge of 6c585756 to lmp-dev-plus-aospDan Albert2014-09-085-22/+22
|\ \ \ \ | |/ / /
| * | | Merge "Use char16_t for char things."Dan Albert2014-09-096-25/+25
| |\ \ \
| | * | | Use char16_t for char things.Dan Albert2014-09-086-25/+25
| | |/ /
* | | | am de86cf13: am 5a6934c0: Merge "Don\'t pollute the namespace for two uses."Dan Albert2014-09-091-3/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Don't pollute the namespace for two uses.Dan Albert2014-09-081-3/+2
| |/
* | Change platformBuildVersionCode to name in aapt dump badgingAdam Lesinski2014-08-291-3/+3
* | Stamp platform version code into app ApksAdam Lesinski2014-08-279-251/+578
* | Merge "Have R classes generate their own reference rewrite logic" into lmp-devAdam Lesinski2014-08-264-18/+194
|\ \
| * | Have R classes generate their own reference rewrite logicAdam Lesinski2014-08-254-18/+194
* | | Introduce anydpi density resource qualifierAdam Lesinski2014-08-252-0/+8
|/ /
* | AAPT: Filtering resource fixAdam Lesinski2014-08-223-6/+52
* | AAPT: Dump installLocation in badgingAdam Lesinski2014-08-221-0/+28
* | Merge "Add better error message for AAPT file conflicts" into lmp-devAdam Lesinski2014-08-211-9/+11
|\ \
| * | Add better error message for AAPT file conflictsAdam Lesinski2014-08-211-9/+11
* | | AAPT: mipmaps should not end up in SplitsAdam Lesinski2014-08-214-10/+70
|/ /
* | Use the correct versionCode for Split APKsAdam Lesinski2014-08-211-0/+7
* | AAPT: Fix regression generating dynamic ref table for shared librariesAdam Lesinski2014-08-201-17/+14
* | Allow enum generated IDs to reuse existing IDsAdam Lesinski2014-08-191-16/+17
* | Include build number in aapt versionAdam Lesinski2014-08-182-1/+13
* | Revert "Include build number in aapt version"Adam Lesinski2014-08-182-2/+1
* | Include build number in aapt versionAdam Lesinski2014-08-182-1/+2
* | AAPT: Output only 64-bit arch when multiArch is trueAdam Lesinski2014-08-151-4/+64
* | Merge "Add FeatureGroup to PackageInfo" into lmp-devAdam Lesinski2014-08-152-6/+37
|\ \
| * | Add FeatureGroup to PackageInfoAdam Lesinski2014-08-152-6/+37
* | | Fix assumption about DynamicRefTable in aaptAdam Lesinski2014-08-151-5/+2
|/ /
* | Fix nine patch outline radius computationChris Craik2014-08-151-3/+7