summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Collapse)AuthorAgeFilesLines
* am 8c71784e: Merge "Initialize mJunkPath to false"Jean-Baptiste Queru2012-06-221-1/+1
|\ | | | | | | | | * commit '8c71784e9e83e914135e996591aa7903edd2fd96': Initialize mJunkPath to false
| * Initialize mJunkPath to falseHaitao Feng2012-06-221-1/+1
| | | | | | | | Change-Id: Ib48bb1d91736d27f055528c3ba275237ff5ada07
* | am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-devDianne Hackborn2012-06-121-1/+3
|\ \ | | | | | | | | | | | | * commit '0f6471ace77387560988964ed0679f843bba6f1f': Fix issue #6641368: can't launch gallery
| * | Fix issue #6641368: can't launch galleryDianne Hackborn2012-06-111-1/+3
| | | | | | | | | | | | | | | | | | | | | This is a revert of 1db36528b12395b9ed9bf8a1005a6d4ace737627, but with comments added so I don't make this mistake again. :) Change-Id: I053216279e3721f08f32f561bb989736ef619f82
* | | am c9fe6568: am 9e22d9c5: Merge "Fix "Too many open files" error for aapt ↵Jean-Baptiste Queru2012-06-051-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | built with Mac OS X SDK 10.6." * commit 'c9fe6568f3e7e4d9dc6da072afc929b9a81001ed': Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.
| * \ \ am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with Mac ↵Jean-Baptiste Queru2012-06-051-0/+4
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | OS X SDK 10.6." * commit '9e22d9c514457c4b163d03b9241e4e28b1698368': Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.
| | * | Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.Ying Wang2012-06-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With SDK 10.6 without _DARWIN_UNLIMITED_STREAMS aapt sometimes fails right away with the error "Too many open files" when calling fopen(). Change-Id: Ifa7bd8a9530d706aa47f98be8186f1aefe943d76
* | | | am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"Tor Norbye2012-06-051-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '44ff9b8f9294e015031fc9293974604771e5efdd': Tweak default ignore-assets path
| * | | am 36ac43ba: Merge "Tweak default ignore-assets path"Tor Norbye2012-06-051-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '36ac43ba9982a78b4a047c8970776505a3fab4da': Tweak default ignore-assets path
| | * | Tweak default ignore-assets pathTor Norbye2012-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add .DS_Store to the list of ignored files that are silently ignored (other dot-files are ignored but aapt emits a "(skipping <x>)" message.) Also, add a "!" prefix to the *~ pattern for Emacs/Vim/Gedit backup files. Finally, move the !*.scc pattern up in front of the .* pattern, such that it doesn't match the earlier .* pattern (which is verbose, unlike !*.scc). Change-Id: Id3e96490f1802486aea8c58366d43e9d413971b8
| * | | am 0748a569: Merge "aapt: Remove terminal pointer incrementaion"Jean-Baptiste Queru2012-06-021-1/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '0748a5698776d1a9693a5449ffc983af26cc533b': aapt: Remove terminal pointer incrementaion
| | * | Merge "aapt: Remove terminal pointer incrementaion"Jean-Baptiste Queru2012-06-021-1/+0
| | |\ \
| | | * | aapt: Remove terminal pointer incrementaionNobuhiro Hayashi2012-03-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When initialization, 'end' pointer refers terminal character in a string. But it is incremented in while loop. It occurs the access to non-secure memory. Issue detail http://code.google.com/p/android/issues/detail?id=24896 Change-Id: I751d1154d797738c87a66374a66933528c045be5
| | * | | Merge "Fix length of pattern." DO NOT MERGE.Ying Wang2012-05-241-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After skipping * with "token++", the length should decrease by 1 as well. (merged from 996b073e813ba1a22a13282ccdebb664f14ba898) Change-Id: Ie6232ef603bb31e25e03b926e6c1bb92ac34902d
* | | | am 996b073e: Fix length of pattern.Ying Wang2012-05-221-0/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit '996b073e813ba1a22a13282ccdebb664f14ba898': Fix length of pattern.
| * | | Fix length of pattern.Ying Wang2012-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | After skipping * with "token++", the length should decrease by 1 as well. Change-Id: I132eb7d12bb756f2f713c607e92741ca834aef81
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AAPT has a fixed built-in list of files and directories to ignore when parsing resource files. Over the years we always had developers requiring specific patterns. Added a command-line option for it: aapt di --ignore-assets "foo*:*.blah" If the env var ANDROID_AAPT_IGNORE is set, it is parsed to find which file/directory patterns to ignore. Otherwise a default is used that matches the current behavior. SDK Bug: 5343 24067 (cherry-pick from AOSP 90897ed87bce639bf6bb2ccf15fbabb59b131bab) Change-Id: Ia4caa2a8188c8c1df143f884e459b8182645995f
* | | | | am 13a0271c: Merge "Add aapt support for generating proguard rules for ↵Dianne Hackborn2012-05-181-0/+27
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | onClick methods." into jb-dev * commit '13a0271cb81d497edbf93f3d6ecf4b9b8da4ee69': Add aapt support for generating proguard rules for onClick methods.
| * | | | Add aapt support for generating proguard rules for onClick methods.Dianne Hackborn2012-05-181-0/+27
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Also fix Activity menu inflater when using the dark on light theme wrapper to still be able to find onClick listeners. Change-Id: Ie206db26d1df96041bc477804e476b02ad99dc9d
* | | | am 8748399f: am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env var."Raphael Moll2012-05-183-45/+99
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '8748399f6f999d21eef9226baadb20f71dfb61ea': Support a new ANDROID_AAPT_IGNORE env var.
| * | | Support a new ANDROID_AAPT_IGNORE env var.Raphael Moll2012-05-093-45/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AAPT has a fixed built-in list of files and directories to ignore when parsing resource files. Over the years we always had developers requiring specific patterns. If the env var ANDROID_AAPT_IGNORE is set, it is parsed to find which file/directory patterns to ignore. Otherwise a default is used that matches the current behavior. Added a command-line option for it: aapt di --ignore-assets "foo*:*.blah" SDK Bug: 5343 24067 Change-Id: Ia4caa2a8188c8c1df143f884e459b8182645995f
* | | | resolved conflicts for merge of 13c04786 to jb-dev-plus-aospJean-Baptiste Queru2012-05-011-0/+15
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ib7aa5a768f4606beb2a4387811cfed7c00cbc111
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a combination of three minor clean-up tasks: - Generate correct idmap even if name lookup fails: Any resources following a resource with a spec but no actual values would receive an incorrect ID in the idmap due to an accumulating offset error. To combat this, a dummy value is inserted in the idmap whenever a resource with a spec but no values is encountered. - Optimize pruning of padding zeroes in idmaps: Earlier, trailing zeroes were iteratively popped from the end of each type block of an idmap. This commit instead tracks where to make the cut, and does so with a single function call. - aapt: warn about resources which lack values: The resource framework assumes every resource to have a value for at least one valid configuration. However, if multiple resource directories are used (several -S options to aapt), the list of configurations is limited by dpi (-c option to aapt) and a resource is only available in discarded dpi configurations, aapt will create a resource entry where each configuration lack an actual value. This commit lets aapt emit a warning whenever this has happened. Change-Id: Ic7451b7f4adfef5bfa6b0d7e64e057f317a2cdaa
* | | | | resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aospJean-Baptiste Queru2012-05-013-12/+1
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | Change-Id: I5386585e473201268c6ed8b05e0a16569d434ea2
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, building overlay packages required passing aapt its -o flag. This commit decouples the idmap generation code from the effects of the -o flag. Since this commit renders the -o flag obsolete, support for the flag was removed from aapt as well. Change-Id: Ied2e0ab8cb800e49623f0a2044b06cd4935473d5
| * | am 816b873d: Move the automatic namespace outside of the res namespace. do ↵Xavier Ducrohet2012-02-231-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | not merge. * commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85': Move the automatic namespace outside of the res namespace. do not merge.
| | * | Move the automatic namespace outside of the res namespace. do not merge.Xavier Ducrohet2012-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d9fe8018ffbf94f18a840005e688ad1d712f0225) Change-Id: I48ca78d5fccc75392b3f1cf9525890e5145293c4
| | * | Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.inazaruk2012-02-231-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for predefined namespace http://schemas.android.com/apk/res/auto that aapt tool recognizes and treats as namespace with package name taken from current application's AndroidManifest.xml, //manifest/package attribute. Signed-off-by: inazaruk <ievgenii.nazaruk@gmail.com> (cherry picked from commit e348909c1966c3d192841cc131a32be6ed90da18) Change-Id: I4bff836c42a309bac36e5d1ce1899131b3c4c194
* | | | Apply --extra-packages in case --custom-pacakge is also specified.Ying Wang2012-04-261-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from master. Change-Id: I2d67b8821afdf064f4186ccd8def1b65f9a7dc88
* | | | Add new aapt dump badging output explaining implicit badging.Dianne Hackborn2012-04-161-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New uses-implied-feature and uses-implied-permission tell you about any features or permissions that aapt is automatically adding to your app, and why it is doing so. Change-Id: I45edb055408e1259699c994f956166ce67e8db5d
* | | | Merge "Adding a line for android-debuggable to 'dump badging' if ↵Dan Morrill2012-04-101-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | AndroidManifest.xml is configured as such. This is to be used by e.g. Play Store to warn the developer that they are about to publish a security hole."
| * | | | Adding a line for android-debuggable to 'dump badging' if AndroidManifest.xmlDan Morrill2012-04-031-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is configured as such. This is to be used by e.g. Play Store to warn the developer that they are about to publish a security hole. Change-Id: Ib6f8537462cbc00ed0504435bdeee2aae0c5b69b
* | | | | Implement call log permission compatibility.Dianne Hackborn2012-04-051-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a pre-JellyBean application requests read/write contacts, it will implicitly be given read/write call log. Change-Id: I029db4b09fda737bb8fba4e1611355ebdbbfd34f
* | | | | Embed layout padding in nine patch imagesAmith Yamasani2012-04-041-19/+175
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added a new custom PNG chunk that carries the layout padding ints. - Extract the padding ticks from .9.png images and store in the chunk. - Load the padding information at runtime into Bitmap and NinePatchDrawable. - The new chunk is ordered first so that it doesn't cause a problem in older versions of the platform. Bug: 6087201 Change-Id: I5de46167a1d44b3ec21065b0c165e594b1dc8399
* | | | frameworks/base: move Zip* from libandroidfw to libutilsColin Cross2012-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ZipUtils is needed by build/tools, move it from libandroidfw (frameworks/base) to libutils (frameworks/native). Change-Id: I2b4b7adcdf68eb25ee7cba5dd3b69eadf0523af3
* | | | Use qsort_r_compat() as a portable wrapper for qsort_r().Jeff Brown2012-03-192-15/+2
| | | | | | | | | | | | | | | | Change-Id: Ie79f81625947f4e95122047605d994c86e872e74
* | | | Fix build break on glibc, for real.Jeff Brown2012-03-191-0/+4
| | | | | | | | | | | | | | | | Change-Id: I8bbec237229b05f96c708d41f3c4da17e2a90e2b
* | | | Fix build break on glibc hosts.Jeff Brown2012-03-191-0/+10
| | | | | | | | | | | | | | | | Change-Id: Ida70bec6ea972d042982428353cbbc33cde25136
* | | | aapt: Preprocess images in parallel.Jeff Brown2012-03-174-14/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently hardcoded to use up to 4 threads. This change substantially reduces the amount of time spent preprocessing framework resources to just a few seconds. Change-Id: I02fdd283fb529a152aeb22ac87f278779fd77983
* | | | Use quicksort to sort the string pool.Jeff Brown2012-03-162-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation of Vector::sort uses insertion sort on the assumption that the data is mostly sorted. It isn't. This change brings the total time spent sorting packages by config down to 500ms from about 93 seconds. Bug: 6186278 Change-Id: Iec8da11e09297acd6c73733d063b0fa9dacf69f7
* | | | Add some comments about StringPool sort order.Jeff Brown2012-03-161-2/+4
| | | | | | | | | | | | | | | | Change-Id: I57f24d46328a6bfef883819eaf95c03114d573bb
* | | | Remove dead code in StringPool.Jeff Brown2012-03-164-106/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The sorted string pool option was no longer used. Neither were strings with associated identifiers. Change-Id: Ic5f6368637fbeedfda873d63f4ad0f3ea9d0d603
* | | | Make StringPool entry types trivially movable.Jeff Brown2012-03-161-0/+9
| | | | | | | | | | | | | | | | Change-Id: If93957a840a0f1cae2e6ef291eeeb1b0c7c20958
* | | | Add new READ_EXTERNAL_STORAGE permission.Dianne Hackborn2012-03-121-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Also adds some initial compatibility code for dealing with it. Change-Id: I104bff11798349e4aaa6da9b7be787b257daa1bb
* | | | Merge "Fix an issue where a non-styled string could be made into a styled ↵Ben Gruver2012-03-081-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | string"
| * | | | Fix an issue where a non-styled string could be made into a styled stringBen Gruver2012-03-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a styled version of an otherwise identical string is encountered before a non-styled version, aapt merges the two, effectively making the non-styled string have a spurious style. Change-Id: I424a61c0c83c59e0b9c8939e457402efd06a7a4f
* | | | | Fix up getAttributeFlags() functionBen Gruver2012-03-071-6/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to a couple of minor clean-up items, this fixes an issue that can rarely cause incorrect parsing of attribute flag values, when there is a '|' character in the few bytes past the end of the attribute value being parsed. Change-Id: I6050b1c2db60720c7c0ab7df9eba8cfc629b320e
generated by cgit v1.1 at 2025-08-05 09:05:55 +0000