summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Expand)AuthorAgeFilesLines
* Add --auto-add-overlay option to aapt.Xavier Ducrohet2010-02-044-6/+16
* Add the --rename-manifest-package option to aapt.Jeff Hamilton2010-02-016-8/+91
* am 6efe03b1: am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs."...Ying Wang2010-01-271-3/+9
|\
| * am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclairYing Wang2010-01-211-3/+9
| |\
| | * Find layout classes in all "layout-*" dirs.Ying Wang2010-01-201-3/+9
* | | am 3c05f1fb: am b5fb50a1: Merge "Add instrumentation as a source tag for prog...Ying Wang2010-01-221-36/+44
|\ \ \ | |/ /
| * | am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep opt...Ying Wang2010-01-191-36/+44
| |\ \ | | |/
| | * Add instrumentation as a source tag for proguard keep options.Ying Wang2010-01-131-36/+44
* | | am b4f41119: am a1d08886: Merge "Only output proguard keep for nonempty attri...Ying Wang2010-01-121-23/+25
|\ \ \ | |/ /
| * | am a1d08886: Merge "Only output proguard keep for nonempty attribute name in ...Ying Wang2010-01-121-23/+25
| |\ \ | | |/
| | * Only output proguard keep for nonempty attribute name in the AndroidManifest....Ying Wang2010-01-121-23/+25
* | | am ce56857e: am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configua...Dianne Hackborn2010-01-071-1/+1
|\ \ \ | |/ /
| * | am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configuation:"Dianne Hackborn2010-01-061-1/+1
| |\ \ | | |/
| | * Fix issue #2357259: aapt tool prints "uses-configuation:"Dianne Hackborn2010-01-061-1/+1
| * | am ce307f88: Merge change Ie4cdb5a3 into eclairXavier Ducrohet2009-12-093-6/+25
| |\ \ | | |/
| * | am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdkDirk Dougherty2009-11-042-9/+9
| |\ \
| * \ \ am 617262d8: Merge change I37c4157d into eclairDoug Zongker2009-10-203-8/+22
| |\ \ \
* | \ \ \ am 15f1bfb0: Merge change I70d0bddb into eclair-mr2Kenny Root2009-12-142-9/+17
|\ \ \ \ \
| * | | | | Revise aapt options for UTF8/16 encodingKenny Root2009-12-112-9/+17
* | | | | | am b5ef7ee1: Default to UTF8 resources when packaging with aaptKenny Root2009-12-102-3/+37
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Default to UTF8 resources when packaging with aaptKenny Root2009-12-102-3/+37
* | | | | | am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2Jean-Baptiste Queru2009-12-103-6/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | resolved conflicts for merge of ce307f88 to eclair-mr2Jean-Baptiste Queru2009-12-103-6/+25
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Add --custom-package to aaptXavier Ducrohet2009-11-303-6/+25
| | | |_|/ | | |/| |
* | | | | am e6c0e993: Merge change I129483f8 into eclair-mr2Kenny Root2009-12-0910-23/+90
|\ \ \ \ \ | |/ / / /
| * | | | Optional use of UTF-8 strings in resource bundlesKenny Root2009-12-0710-23/+90
| * | | | Fix bitmask in aapt's StringPool length constructionKenny Root2009-12-041-1/+1
| |/ / /
* | | | am 0d55daff: am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdkDirk Dougherty2009-11-042-9/+9
|\ \ \ \ | |/ / /
| * | | am 00e44ef2: Merge change I54545dfd into eclair-sdkDirk Dougherty2009-11-042-9/+9
| |\ \ \ | | |_|/ | |/| |
| | * | doc change: fix broken R.styleable formatting (caused by missing periods). Ad...Dirk Dougherty2009-11-032-9/+9
| * | | add "junk path" -k option to aapt (DO NOT MERGE)Doug Zongker2009-10-193-8/+22
| |/ /
* | | am afbf8afa: Merge change I564b5b00 into eclair-mr2Doug Zongker2009-10-133-8/+22
|\ \ \ | |_|/ |/| |
| * | add "junk path" -k option to aaptDoug Zongker2009-10-133-8/+22
| |/
* | am 20b39471: Merge change 26933 into eclairRaphael2009-09-241-0/+4
|\ \ | |/
| * AAPT: Ignore visual source safe files in resourcesRaphael2009-09-241-0/+4
* | am f1871e27: Merge change 26009 into eclairSuchi Amalapurapu2009-09-201-2/+3
|\ \ | |/
| * Fix issue with printing gles version in aapt dump badging optionSuchi Amalapurapu2009-09-201-2/+3
* | am 7fc39b26: Merge change 25238 into eclairDianne Hackborn2009-09-152-1/+57
|\ \ | |/
| * Implement issue #1780928: Need support hiding nav keys.Dianne Hackborn2009-09-152-1/+57
* | merge from open-source masterJean-Baptiste Queru2009-09-041-2/+2
|\ \
| * \ merge from donutJean-Baptiste Queru2009-09-031-0/+5
| |\ \
| | * | donut snapshotJean-Baptiste Queru2009-08-311-0/+5
| * | | Fix %p vs %s typo in aapt messageKenny Root2009-09-011-2/+2
* | | | am e8f605ff: Merge change 23761 into eclairRobert Greenwalt2009-09-031-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix compilation of add-resource tag.Robert Greenwalt2009-09-021-1/+1
* | | | am 66c70e13: Merge change 23529 into eclairEric Fischer2009-09-022-3/+7
|\ \ \ \ | |/ / /
| * | | Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.Eric Fischer2009-09-012-3/+7
* | | | merge from open-source masterJean-Baptiste Queru2009-09-011-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fix bitmask in aapt's StringPool length constructionKenny Root2009-08-211-1/+1
| |/
| * donut snapshotJean-Baptiste Queru2009-07-292-53/+137