summaryrefslogtreecommitdiffstats
path: root/tools/aapt/ResourceTable.cpp
Commit message (Expand)AuthorAgeFilesLines
* am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute u...Adam Lesinski2015-01-141-47/+125
|\
| * AAPT: Handle all old unversioned attribute usageAdam Lesinski2015-01-141-47/+125
* | am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be...Adam Lesinski2014-12-161-25/+17
|\ \ | |/
| * AAPT: attributes showing up after v21 attributes would be removed for pre-21 ...Adam Lesinski2014-12-101-25/+17
* | Merge commit '0953ab27' into manualmergeAdam Lesinski2014-12-051-18/+153
|\ \ | |/
| * AAPT: Move private attrs to new type for frameworkAdam Lesinski2014-12-031-18/+150
* | am 8aa93764: Merge "Fixing NULL pointer access causing segmentation fault in ...Adam Lesinski2014-11-111-1/+1
|\ \
| * | Fixing NULL pointer access causing segmentation fault in aaptJörgen Ekström2014-11-071-1/+1
| * | am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" ...Adam Lesinski2014-10-201-1/+4
| |\ \
| * \ \ am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v fl...Adam Lesinski2014-10-031-20/+26
| |\ \ \
| * \ \ \ resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aospAndreas Gampe2014-10-011-136/+167
| |\ \ \ \
| * \ \ \ \ am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually sh...Adam Lesinski2014-09-261-1/+18
| |\ \ \ \ \
| * \ \ \ \ \ am 36b5795f: am 81745c51: Merge "AAPT: Continuation of public/private attribu...Adam Lesinski2014-09-221-16/+167
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT publi...Adam Lesinski2014-09-191-0/+196
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge commit 'fa31eb2c' into manualmergeAdam Lesinski2014-11-101-8/+9
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | split-select: Fix rules generated for anydpi densityAdam Lesinski2014-11-061-8/+9
* | | | | | | | | Merge commit 'fb96e54' into manualmergeAdam Lesinski2014-11-051-0/+32
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Add error checking to aapt for split generationAdam Lesinski2014-11-031-0/+32
| * | | | | | | | Fix issues that will be present in C++11Adam Lesinski2014-11-031-5/+5
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | am d3969d92: am 6dfe03ae: am 73a8c596: am 3f8c7dec: Merge "AAPT: Fix path for...Adam Lesinski2014-10-201-1/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | AAPT: Fix path for final generated resources on WindowsAdam Lesinski2014-10-201-1/+4
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | am 85035d90: am b2b166a5: am 397001b2: am a80aba70: Merge "AAPT: Gate v21 res...Adam Lesinski2014-10-041-20/+26
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | AAPT: Gate v21 resource synthesizing logging behind -v flagAdam Lesinski2014-10-031-20/+26
| | |_|_|/ / | |/| | | |
* | | | | | resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aospAndreas Gampe2014-10-011-136/+167
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Frameworks/base: Fix AAPT warningsAndreas Gampe2014-10-011-133/+159
* | | | | | am a196e203: am 98e858b1: am 581dfee1: am 0a6c5ea4: Merge "AAPT: Fix issue wi...Adam Lesinski2014-09-261-1/+18
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | AAPT: Fix issue with synthesized resource not actually showing upAdam Lesinski2014-09-241-1/+18
| | |_|_|/ | |/| | |
* | | | | am d4e5b601: am 37e3df38: am 1aa4db07: am 81745c51: Merge "AAPT: Continuation...Adam Lesinski2014-09-221-16/+167
|\ \ \ \ \ | |/ / / /
| * | | | AAPT: Continuation of public/private attribute fixAdam Lesinski2014-09-221-16/+167
| | |_|/ | |/| |
* | | | am 9ee3ba23: am e7e9ad6d: am 863b1a90: am 19f9d54f: Merge "Fix backwards comp...Adam Lesinski2014-09-191-0/+196
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Fix backwards compat problem with AAPT public attrsAdam Lesinski2014-09-181-0/+196
* | | 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 6c585756 to lmp-dev-plus-aospDan Albert2014-09-081-5/+5
|\ \ \ | |/ / |/| / | |/
| * Use char16_t for char things.Dan Albert2014-09-081-5/+5
* | AAPT: mipmaps should not end up in SplitsAdam Lesinski2014-08-211-7/+29
* | 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
* | AAPT support for feature splitsAdam Lesinski2014-08-041-133/+118
* | Fix large memory corruption in AAPTAdam Lesinski2014-07-301-4/+12
* | Support multiple resource tables with same packageAdam Lesinski2014-06-181-3/+10
* | Merge "Add support for building split APKs"Adam Lesinski2014-05-121-17/+11
|\ \
| * | Add support for building split APKsAdam Lesinski2014-05-111-17/+11
* | | am 86768034: am b593ad60: am f1f28d1d: Merge "Skip resource files for locales...Elliott Hughes2014-05-061-0/+15
|\ \ \ | |/ / |/| / | |/
| * Skip resource files for locales en-XA and ar-XBIgor Viarheichyk2014-05-051-0/+15
* | am fd955f14: am 6a6979ad: am 86315c45: Merge "Fixes issue causing pseudolocal...Elliott Hughes2014-04-301-2/+1
|\ \ | |/
| * Fixes issue causing pseudolocalization of stringsIgor Viarheichyk2014-04-301-2/+1
* | resolved conflicts for merge of 56ca8219 to masterElliott Hughes2014-04-181-33/+61
|\ \ | |/
| * Pseudolocalizer improvements.Anton Krumin2014-04-091-33/+61
| * Reduce warning verbosity in aaptAdam Lesinski2014-03-241-28/+45