summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Collapse)AuthorAgeFilesLines
* Fix writing text version of styleable IDs. do not merge.Xavier Ducrohet2012-09-261-1/+1
| | | | | | (cherry picked from commit d16047434bca24b2811de7ea9d22de6ee0f87f79) Change-Id: Ic679080d5157daf77c35516c8f682bd13e2b4d96
* am 79c95c3b: am 5de96035: am 31820a35: Merge "Add --output-text-symbols ↵Xavier Ducrohet2012-09-173-14/+205
|\ | | | | | | | | | | | | option to aapt." * commit '79c95c3b50ff332f9c92430fd10a15eb648a0b02': Add --output-text-symbols option to aapt.
| * am 31820a35: Merge "Add --output-text-symbols option to aapt."Xavier Ducrohet2012-09-173-14/+205
| |\ | | | | | | | | | | | | * commit '31820a35b2cf864a8dcb71d43e6fd21d54f49a2d': Add --output-text-symbols option to aapt.
| | * Add --output-text-symbols option to aapt.Xavier Ducrohet2012-09-113-14/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Library projects in the SDK are built using --non-constant-id to generate a temporary R.java class. When the library is packaged with the application to generate an apk, the R class is recreated with the proper IDs due to all the resources coming from the app and all the libraries. However for large apps with many libraries (each with their own R class in their package), this means a lot of unnecessary IDs: all R classes contains all the IDs including for resources from by projects they don't have access through the dependency graph. For really large apps (X,000 resources), with lots of libraries (10+), this can generate tens of thousands of resources, which can trigger dalvik's limit of 65K fields and methods per dex files. This changes lets aapt generate not only the R class but a simple text file containing the list of all those IDs so that it is easier to parse back. The SDK build system will not ask aapt to generate the R class of the libraries (through the --extra-packages option), instead it will then read this file to know what IDs are needed for each library and generate a much smaller R class for each library (using the same text file output from compiling all the resources to get the final integer value). Change-Id: I4db959fec372cf3ead9950e4b2b82fa1ae7eed2d
* | | am 8a67598e: am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert ↵Xavier Ducrohet2012-09-173-19/+60
|\ \ \ | |/ / | | | | | | | | | | | | | | | option to aapt." * commit '8a67598eb780560b7efe4e1d9944c7cbcf83bbb1': Add --error-on-failed-insert option to aapt.
| * | am d7252571: Merge "Add --error-on-failed-insert option to aapt."Xavier Ducrohet2012-09-173-19/+60
| |\ \ | | |/ | | | | | | | | | * commit 'd72525718ea7ef3e1f97cf557365b143c8919a5b': Add --error-on-failed-insert option to aapt.
| | * Add --error-on-failed-insert option to aapt.Xavier Ducrohet2012-09-113-19/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new SDK build system give the ability to insert versionCode/Name and min/targetSdkVersion in the manifest but aapt won't replace those if they already exist. The main problem is that aapt doesn't actually fail when it doesn't replace them, making the output not what the developer wanted. This patch set adds an option to aapt to make it return an error if the insert failed because the attribute already existed. Change-Id: I8938ec1238da407a8562c974e9598db39001ffd9
* | | am 61d09810: am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header ↵Elliott Hughes2012-09-092-2/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | files from the approved location." * commit '61d09810a7b478810adc15af2495136255377e25': Fix aapt to get expat header files from the approved location.
| * | am bfe1ab82: Merge "Fix aapt to get expat header files from the approved ↵Elliott Hughes2012-09-092-2/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | location." * commit 'bfe1ab825731d365fef169deab646d7ceeafc998': Fix aapt to get expat header files from the approved location.
| | * Fix aapt to get expat header files from the approved location.Elliott Hughes2012-09-092-2/+1
| | | | | | | | | | | | Change-Id: Ic7c796e048cfe98ee355c18b3708fee5ea716e2e
* | | Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resourcesFabrice Di Meglio2012-09-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - we cannot use "rtl" / "ltr" qualifiers as they can conflict with ISO-639 Alpha-3 codespace which uses 3 letters for identifying a language code (and could use either "rtl" or "ltr" strings for defining a language in the future). - we are using instead "ldrtl" for RTL and "ldltr" for LTR resources. Those qualifiers are defined by more than 3 chars and outside of what is defined into ISO-639. They are also more understandable as "ld" prefix is for "layoutdirection" Change-Id: Id43e948103707e09bef63ebd54ac1779dde58e72
* | | Add support for "-rtl" in resourcesFabrice Di Meglio2012-08-233-7/+67
|/ / | | | | | | | | | | - fix bug #7035019 Need to have "-rtl" support for Resource Change-Id: Ic82145c2ac672729d8a6c695a5f343276a1a0a2c
* | am e67f8c8c: Merge "Normalize output from aapt d xmltree"Jean-Baptiste Queru2012-08-081-1/+2
|\ \ | |/ | | | | | | * commit 'e67f8c8c279e20fff5f426eccd062b709e6280ed': Normalize output from aapt d xmltree
| * Merge "Normalize output from aapt d xmltree"Jean-Baptiste Queru2012-08-081-1/+2
| |\
| | * Normalize output from aapt d xmltreeShachar Shemesh2012-07-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using aapt dump xmltree to dump an XML which has a content element with newlines, the output contains a newline. This makes it very difficult, sometimes impossible, to understand what is part of the content, and what is the meta-data. We now pass XML content through the same normalizer used for other tags. Change-Id: I327321520fac563eb32aecaf796f2473866697fc
* | | am b71393bd: Merge "Fix aapt -G to properly support class attr in fragment." ↵Xavier Ducrohet2012-07-191-17/+31
|\ \ \ | |/ / |/| | | | | | | | | | | | | | into jb-dev * commit 'b71393bd34a48eeb622292e78f43b99e374a5e3a': Fix aapt -G to properly support class attr in fragment.
| * | Fix aapt -G to properly support class attr in fragment.Xavier Ducrohet2012-07-191-17/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code added attributes android:name and class to a KeyedVector under the same key (fragment) so the 2nd add (android:name) removed class with was never checked. This replace the value type in the KeyedVector to be Vector<NamespaceAttributePair> instead of just NamespaceAttributePair. Change-Id: I009b8a8cca878191661c2a63bb14c967d230498d
* | | 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
generated by cgit v1.1 at 2025-01-24 10:54:13 +0000