summaryrefslogtreecommitdiffstats
path: root/tools/aapt/Resource.cpp
Commit message (Expand)AuthorAgeFilesLines
* am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN."Dan Albert2014-10-201-1/+1
|\
| * Fix an overflow found by ASAN.Dan Albert2014-10-201-1/+1
* | resolved conflicts for merge of 1dcc75b2 to lmp-dev-plus-aospAndreas Gampe2014-10-011-41/+71
|\ \ | |/
| * Frameworks/base: Fix AAPT warningsAndreas Gampe2014-10-011-48/+70
* | am 36b5795f: am 81745c51: Merge "AAPT: Continuation of public/private attribu...Adam Lesinski2014-09-221-13/+37
|\ \
| * | AAPT: Continuation of public/private attribute fixAdam Lesinski2014-09-221-13/+37
* | | am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT publi...Adam Lesinski2014-09-191-3/+21
|\ \ \ | |/ /
| * | Fix backwards compat problem with AAPT public attrsAdam Lesinski2014-09-181-3/+21
* | | am 972628dc: am 5128e88e: Merge "Don\'t use reflection when generating the on...Marcin Kosiba2014-09-111-103/+71
|\ \ \ | |/ /
| * | Don't use reflection when generating the onResourcesLoaded callback.Marcin Kosiba2014-09-111-103/+71
* | | resolved conflicts for merge of 6c585756 to lmp-dev-plus-aospDan Albert2014-09-081-4/+4
|\ \ \ | |/ / |/| / | |/
| * Use char16_t for char things.Dan Albert2014-09-081-4/+4
| * Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-141-0/+1
| * Change ResourceType cookies to int32_t.Narayan Kamath2014-01-311-2/+1
| * Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEADThe Android Open Source Project2013-11-221-1/+27
| |\
| | * Transition API changes from API council recommendationsChet Haase2013-09-041-26/+1
| * | Fix a variety of small publicly-reported bugs.Elliott Hughes2013-10-291-22/+22
* | | Stamp platform version code into app ApksAdam Lesinski2014-08-271-4/+131
* | | Have R classes generate their own reference rewrite logicAdam Lesinski2014-08-251-12/+122
* | | AAPT: mipmaps should not end up in SplitsAdam Lesinski2014-08-211-1/+2
* | | Use the correct versionCode for Split APKsAdam Lesinski2014-08-211-0/+7
* | | Add FeatureGroup to PackageInfoAdam Lesinski2014-08-151-0/+35
* | | Ensure that split names are validAdam Lesinski2014-08-141-2/+2
* | | Merge "AAPT support for feature splits" into lmp-devAdam Lesinski2014-08-091-1/+22
|\ \ \
| * | | AAPT support for feature splitsAdam Lesinski2014-08-041-1/+22
* | | | Have styleable indices be non-final for library projectsAdam Lesinski2014-08-071-3/+8
|/ / /
* | | Mark resource-only splits as hasCode=false.Jeff Sharkey2014-07-151-0/+7
* | | Add versionCode to split manifest; compile.Jeff Sharkey2014-07-091-8/+19
* | | Support multiple resource tables with same packageAdam Lesinski2014-06-181-5/+9
* | | Add support for @SystemApi annotation to aapt.Jeff Brown2014-06-061-37/+44
* | | Add support for building split APKsAdam Lesinski2014-05-111-68/+82
* | | Child nodes of <preference-headers> now output proguard keep options.Adam Lesinski2014-04-251-7/+12
* | | Add --replace-version flag to aapt.Jeff Davidson2014-02-251-7/+31
* | | Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-101-0/+1
* | | Change ResourceType cookies to int32_t.Narayan Kamath2014-01-281-1/+1
* | | Re-apply several tools fixes lost by the directory rearrangement.Elliott Hughes2014-01-271-2/+2
* | | Remove scenes from Resource.cppChet Haase2014-01-271-26/+1
* | | Revert "Move frameworks/base/tools/ to frameworks/tools/"Adam Lesinski2014-01-271-0/+2676
* | | Move frameworks/base/tools/ to frameworks/tools/Mike Lockwood2013-08-281-2676/+0
| |/ |/|
* | libutils clean-upMathias Agopian2013-05-071-1/+1
* | am eb6403e9: resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aospJeff Brown2013-04-261-59/+55
|\ \ | |/
| * Generate SDK docs for v7 support library packages.Jeff Brown2013-04-261-59/+55
* | First draft of Scenes & Transitions featureChet Haase2013-04-181-0/+51
|/
* Revert "Make --non-constant-id generates non final IDs for styleable."Xavier Ducrohet2013-04-131-12/+5
* Make --non-constant-id generates non final IDs for styleable.Xavier Ducrohet2013-04-121-5/+12
* am fb34490f: Merge "Fix writing text version of styleable IDs."Xavier Ducrohet2012-09-261-1/+1
|\
| * Fix writing text version of styleable IDs.Xavier Ducrohet2012-09-261-1/+1
* | am 31820a35: Merge "Add --output-text-symbols option to aapt."Xavier Ducrohet2012-09-171-12/+186
|\ \ | |/
| * Add --output-text-symbols option to aapt.Xavier Ducrohet2012-09-111-12/+186
* | am d7252571: Merge "Add --error-on-failed-insert option to aapt."Xavier Ducrohet2012-09-171-18/+49
|\ \ | |/