summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Expand)AuthorAgeFilesLines
* am 8c71784e: Merge "Initialize mJunkPath to false"Jean-Baptiste Queru2012-06-221-1/+1
|\
| * Initialize mJunkPath to falseHaitao Feng2012-06-221-1/+1
* | am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-devDianne Hackborn2012-06-121-1/+3
|\ \
| * | Fix issue #6641368: can't launch galleryDianne Hackborn2012-06-111-1/+3
* | | am c9fe6568: am 9e22d9c5: Merge "Fix "Too many open files" error for aapt bui...Jean-Baptiste Queru2012-06-051-0/+4
|\ \ \
| * \ \ am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with Mac O...Jean-Baptiste Queru2012-06-051-0/+4
| |\ \ \ | | | |/ | | |/|
| | * | Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.Ying Wang2012-06-051-0/+4
* | | | am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"Tor Norbye2012-06-051-1/+1
|\ \ \ \ | |/ / /
| * | | am 36ac43ba: Merge "Tweak default ignore-assets path"Tor Norbye2012-06-051-1/+1
| |\ \ \ | | |/ /
| | * | Tweak default ignore-assets pathTor Norbye2012-06-041-1/+1
| * | | am 0748a569: Merge "aapt: Remove terminal pointer incrementaion"Jean-Baptiste Queru2012-06-021-1/+0
| |\ \ \ | | |/ /
| | * | Merge "aapt: Remove terminal pointer incrementaion"Jean-Baptiste Queru2012-06-021-1/+0
| | |\ \
| | | * | aapt: Remove terminal pointer incrementaionNobuhiro Hayashi2012-03-301-1/+0
| | * | | Merge "Fix length of pattern." DO NOT MERGE.Ying Wang2012-05-241-0/+1
| |/ / /
* | | | am 996b073e: Fix length of pattern.Ying Wang2012-05-221-0/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix length of pattern.Ying Wang2012-05-221-0/+1
| * | | Merge "Merge "AAPT: support a new --ignore-assets flag."" into jb-devRaphael Moll2012-05-213-45/+99
| |\ \ \
| | * | | Merge "AAPT: support a new --ignore-assets flag."Raphael Moll2012-05-183-45/+99
* | | | | am 13a0271c: Merge "Add aapt support for generating proguard rules for onClic...Dianne Hackborn2012-05-181-0/+27
|\ \ \ \ \ | |/ / / /
| * | | | Add aapt support for generating proguard rules for onClick methods.Dianne Hackborn2012-05-181-0/+27
| |/ / /
* | | | am 8748399f: am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env var."Raphael Moll2012-05-183-45/+99
|\ \ \ \ | | |/ / | |/| |
| * | | Support a new ANDROID_AAPT_IGNORE env var.Raphael Moll2012-05-093-45/+99
* | | | resolved conflicts for merge of 13c04786 to jb-dev-plus-aospJean-Baptiste Queru2012-05-011-0/+15
|\ \ \ \ | |/ / /
| * | | Merge "Runtime resource overlay: clean-up."Jean-Baptiste Queru2012-05-011-0/+15
| |\ \ \
| | * | | Runtime resource overlay: clean-up.Mårten Kongstad2012-02-161-0/+15
* | | | | resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aospJean-Baptiste Queru2012-05-013-12/+1
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Merge "Build overlay packages just like regular packages."Jean-Baptiste Queru2012-05-013-12/+1
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Build overlay packages just like regular packages.Mårten Kongstad2012-02-073-12/+1
| * | am 816b873d: Move the automatic namespace outside of the res namespace. do no...Xavier Ducrohet2012-02-231-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
* | | | Apply --extra-packages in case --custom-pacakge is also specified.Ying Wang2012-04-261-14/+17
* | | | Add new aapt dump badging output explaining implicit badging.Dianne Hackborn2012-04-161-1/+46
* | | | Merge "Adding a line for android-debuggable to 'dump badging' if AndroidManif...Dan Morrill2012-04-101-0/+10
|\ \ \ \
| * | | | Adding a line for android-debuggable to 'dump badging' if AndroidManifest.xmlDan Morrill2012-04-031-0/+10
* | | | | Implement call log permission compatibility.Dianne Hackborn2012-04-051-0/+24
* | | | | Embed layout padding in nine patch imagesAmith Yamasani2012-04-041-19/+175
|/ / / /
* | | | frameworks/base: move Zip* from libandroidfw to libutilsColin Cross2012-03-221-1/+1
* | | | Use qsort_r_compat() as a portable wrapper for qsort_r().Jeff Brown2012-03-192-15/+2
* | | | Fix build break on glibc, for real.Jeff Brown2012-03-191-0/+4
* | | | Fix build break on glibc hosts.Jeff Brown2012-03-191-0/+10
* | | | aapt: Preprocess images in parallel.Jeff Brown2012-03-174-14/+50
* | | | Use quicksort to sort the string pool.Jeff Brown2012-03-162-6/+10
* | | | Add some comments about StringPool sort order.Jeff Brown2012-03-161-2/+4
* | | | Remove dead code in StringPool.Jeff Brown2012-03-164-106/+22
* | | | Make StringPool entry types trivially movable.Jeff Brown2012-03-161-0/+9
* | | | Add new READ_EXTERNAL_STORAGE permission.Dianne Hackborn2012-03-121-0/+12
* | | | Merge "Fix an issue where a non-styled string could be made into a styled str...Ben Gruver2012-03-081-1/+3
|\ \ \ \
| * | | | Fix an issue where a non-styled string could be made into a styled stringBen Gruver2012-03-071-1/+3
* | | | | Fix up getAttributeFlags() functionBen Gruver2012-03-071-6/+2
|/ / / /