summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'tmo/themes-2.3.1_r1' into themes-4.0Ricardo Cerqueira2012-05-043-4/+28
|\
| * Merge commit 'android-2.3.1_r1' into themes-exp-2.3.1_r1Josh Guilfoyle2010-12-2310-49/+422
| |\
| * | Updated copyright headers.Josh Guilfoyle2010-11-183-0/+3
| * | Merge commit 'themes/themes-eclair' into themes-2.2_r1Dirk Sigurdson2010-07-043-4/+25
| |\ \
| | * \ Merge remote branch 'korg/eclair' into themes-eclairDirk Sigurdson2010-02-073-6/+25
| | |\ \
| | * \ \ Merge branch 'themes-1.5r2' into themes-eclairJosh Guilfoyle2009-11-243-4/+25
| | |\ \ \
| | | * | | Port over aapt -x related change.Sergey Ten2009-08-273-4/+25
| | | * | | Revert "This is a patch I've checked in in the old repo and apparently it was...Josh Guilfoyle2009-08-077-132/+5
| | | * | | This is a patch I've checked in in the old repo and apparently it was not por...Sergey Ten2009-07-147-5/+132
| | * | | | eclair snapshotJean-Baptiste Queru2009-11-1318-167/+3402
| * | | | | As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk filesDan Morrill2010-06-161-1/+1
* | | | | | Move the automatic namespace outside of the res namespace. do not merge.Xavier Ducrohet2012-02-231-1/+1
* | | | | | Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.inazaruk2012-02-231-3/+9
* | | | | | Make aapt ignore tools-related data.Xavier Ducrohet2012-02-061-31/+46
* | | | | | Merge "AAPT fix printf %zd crash on Windows". Do not merge.Raphael2011-12-112-5/+21
* | | | | | add -ldl to host executablesIliyan Malchev2011-10-201-1/+1
* | | | | | Whoops, remove left-over debug output.Dianne Hackborn2011-10-161-1/+1
* | | | | | New aapt feature to do smarter filtering of configurations.Dianne Hackborn2011-10-1613-286/+615
* | | | | | Add package-verifier to aapt dump badgingKenny Root2011-09-291-0/+10
* | | | | | Don't lose product variant strings that also vary between locales.Eric Fischer2011-09-272-1/+37
* | | | | | am d98e1be2: am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated d...Xavier Ducrohet2011-08-183-9/+33
|\ \ \ \ \ \
| * \ \ \ \ \ am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependency fil...Xavier Ducrohet2011-08-183-9/+33
| |\ \ \ \ \ \
| | * | | | | | Change generated dependency file namesJosiah Gaskin2011-08-163-9/+33
* | | | | | | | am 6abf2f50: am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"Xavier Ducrohet2011-07-271-15/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"Xavier Ducrohet2011-07-271-15/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Remove Debug CodeJosiah Gaskin2011-07-271-15/+0
* | | | | | | | Change ZipFile flags anonymous enumKenny Root2011-07-251-1/+1
* | | | | | | | am b3ab070e: am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for...Xavier Ducrohet2011-07-202-4/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"Xavier Ducrohet2011-07-202-4/+27
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fix to compile for windowsJosiah Gaskin2011-07-202-4/+27
* | | | | | | | am 84be06e4: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aospXavier Ducrohet2011-07-2020-13/+1206
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aospXavier Ducrohet2011-07-2020-13/+1206
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Added Caching for PreProcessed PNGsJosiah Gaskin2011-07-2020-13/+1206
* | | | | | | | am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aospXavier Ducrohet2011-07-208-26/+62
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | resolved conflicts for merge of 2c311be7 to honeycomb-plus-aospXavier Ducrohet2011-07-208-26/+62
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Add generation of dependency file for .ap_ packageJosiah Gaskin2011-07-188-27/+63
* | | | | | | | am 9139868b: am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency gen...Xavier Ducrohet2011-07-197-18/+110
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aa...Xavier Ducrohet2011-07-197-18/+110
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Add dependency generation to Aapt for R.javaJosiah Gaskin2011-06-278-19/+111
* | | | | | | | am bf31250b: am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created ...Xavier Ducrohet2011-07-193-1/+26
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into l...Xavier Ducrohet2011-07-193-1/+26
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Copy once-created R.java into library projectsJosiah Gaskin2011-06-273-1/+26
| | * | | | | | Merge changes I0ab47e2f,Ib8016996Conley Owens2011-04-271-1/+2
| | |\ \ \ \ \ \
| | | * | | | | | Normalize output of XMLtree contentShachar Shemesh2011-04-111-1/+2
* | | | | | | | | Output Proguard options for also overlay layouts.Ying Wang2011-06-201-0/+5
|/ / / / / / / /
* | | | | | | | am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK ...Dianne Hackborn2011-06-161-8/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | New orientation handling. Only impacts SDK (aapt dump badging).Dianne Hackborn2011-06-161-8/+48
* | | | | | | | | am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation f...Dianne Hackborn2011-06-141-22/+134
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Add new landscape and portrait orientation features.Dianne Hackborn2011-06-141-22/+134
* | | | | | | | | am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public s...Dianne Hackborn2011-06-101-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /