summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Collapse)AuthorAgeFilesLines
* Generate SDK docs for v7 support library packages.Jeff Brown2013-04-261-59/+55
| | | | | | | | | | | | This change required fixing some bugs in how AAPT handles qualified symbols such as "android:layout_height" when generating JavaDoc links. The links were being generated using the package name of the generated R file rather than the package name of the referenced symbol. These broken links caused the JavaDoc build to fail. Bug: 8175766 Change-Id: I52fbef27825a25abca960cb44b59c2132267e9d6
* Revert "Make --non-constant-id generates non final IDs for styleable."Xavier Ducrohet2013-04-131-12/+5
| | | | This reverts commit 8730f46ae5ba9021a0e01c068ffc6b552b6c4510.
* Make --non-constant-id generates non final IDs for styleable.Xavier Ducrohet2013-04-121-5/+12
| | | | | | | | | | This was already done for all other types of resources, but not for styleable (or the constants for the styleable array indices). This fixes this. This only affects the SDK as this is used by the SDK toolchain only. Change-Id: Idfc2f7915be2b0e88590f38fd660610ffc7e160c
* Add liblogYing Wang2013-04-091-2/+2
| | | | | Bug: 8580410 Change-Id: I746aa8258866508c3a725d0773faf4518096548f
* aapt: add support for optional uses-permissionNick Kralevich2013-04-031-0/+8
| | | | | | | | | | | | Applications can request a permission with android:required="false". For example: <uses-permission android:name="android.permission.READ_PHONE_STATE" android:required="false" /> Make aapt understand such permissions. Bug: 8522021 Change-Id: I7d3af64e7c3eca608316d5bea19c4ea639dd2b7a
* Fix typo.Dianne Hackborn2013-02-251-1/+1
| | | | Change-Id: I71c8458e02dc9b9a4c59e51ded37b57a930038f9
* Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!Dianne Hackborn2013-02-121-0/+5
| | | | Change-Id: Ib05a2eb6a03db50074805a437a3639a7d10684a0
* resolved conflicts for merge of c71c678e to masterXavier Ducrohet2013-01-151-1/+7
|\ | | | | | | Change-Id: I9e1a6a1151af00f0a13e2010776276b240e0ac3a
| * am a4e10cc7: am 6080cc5f: resolved conflicts for merge of dd52dfed to ↵Xavier Ducrohet2013-01-151-0/+19
| |\ | | | | | | | | | | | | | | | | | | jb-mr1.1-ub-dev * commit 'a4e10cc746caea514216f436e2065b3bbefb25ef': Fix the single crunch command to return the right error code.
| | * am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-devXavier Ducrohet2013-01-151-0/+19
| | |\ | | | | | | | | | | | | | | | | * commit '6080cc5fd7c332c79098a50605c0c37d99d4c481': Fix the single crunch command to return the right error code.
| | | * resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-devXavier Ducrohet2013-01-151-0/+19
| | | |\ | | | | | | | | | | | | | | | Change-Id: I839981af97e54c39f0ea0b8141a4dd02959263a0
| | | | * Fix the single crunch command to return the right error code.Xavier Ducrohet2013-01-151-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Casting from status_t to int doesn't work for return values if the lower 8 bits are all 0. Change-Id: I88e910dfe46cb72acd1595352e71da3c8eff4ca9
| | | | * Add single crunch command to aapt. do not merge.Xavier Ducrohet2013-01-024-8/+62
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the crunch command would work on a full res folder and output a full res folder (with only the drawables). This was only used in the SDK. The incremental logic is moved to the SDK build system so we change the crunch command (or rather add a new one) to only crunch a single file. (cherry picked from commit b1f6ad82dd8d1702617a757a88430604b3131fac) Change-Id: I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
| | * | am 5f958e9b: am 67b38c44: Cache resource ID lookups in aaptChristopher Tate2012-11-294-5/+148
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '5f958e9bfc793b3b653dfc88418bbd7745e633e1': Cache resource ID lookups in aapt
| | | * Cache resource ID lookups in aaptChristopher Tate2012-11-284-5/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This speeds up certain workloads considerably, particularly those involved in buildling apps via the SDK. Windows-based use should particularly benefit from the change. (cherry picked from commit d8dde13a63565dcd72bcf03a5088407b737ba793) Change-Id: I33835bc64ade77688d41e8bfcd371b0a5f59d8fd
| | | * Fix writing text version of styleable IDs. do not merge.Xavier Ducrohet2012-09-261-1/+1
| | |/ | | | | | | | | | | | | | | | (cherry picked from commit d16047434bca24b2811de7ea9d22de6ee0f87f79) Change-Id: Ic679080d5157daf77c35516c8f682bd13e2b4d96
* | | Add single crunch command to aapt.Xavier Ducrohet2013-01-024-8/+62
|/ / | | | | | | | | | | | | | | | | | | | | | | Previously the crunch command would work on a full res folder and output a full res folder (with only the drawables). This was only used in the SDK. The incremental logic is moved to the SDK build system so we change the crunch command (or rather add a new one) to only crunch a single file. Change-Id: I635ee3e871d035b9db2fb593802d914e48241abf
* | Cache resource ID lookups in aaptChristopher Tate2012-11-274-5/+148
| | | | | | | | | | | | | | | | This speeds up certain workloads considerably, particularly those involved in buildling apps via the SDK. Windows-based use should particularly benefit from the change. Change-Id: I29f4b3a77400b201ee219729cc28a5e359c0c5e8
* | am 253f7635: am fb34490f: Merge "Fix writing text version of styleable IDs."Xavier Ducrohet2012-09-261-1/+1
|\ \ | |/ |/| | | | | * commit '253f76357dc9acdb329f321190eca4f0b049b4af': Fix writing text version of styleable IDs.
| * am fb34490f: Merge "Fix writing text version of styleable IDs."Xavier Ducrohet2012-09-261-1/+1
| |\ | | | | | | | | | | | | * commit 'fb34490f4dca7aac623fb9a80fe9a2371107a786': Fix writing text version of styleable IDs.
| | * Fix writing text version of styleable IDs.Xavier Ducrohet2012-09-261-1/+1
| | | | | | | | | | | | Change-Id: I3f2614689a597de3fd46628c020cf649a808c82f
* | | 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
generated by cgit v1.1 at 2024-10-27 10:37:27 +0000