summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Collapse)AuthorAgeFilesLines
* Prune unneeded density resources from APKAdam Lesinski2013-10-151-1/+38
| | | | | | | | | | | | | | | | | When a preferred density is specified, prune all but the closest matching density when the exact density resource does not exist. If a preferred density resource does not exist and a higher density resource exists, prune all but the resource with the next highest density relative to the preferred density. If a preferred density resource does not exist and there is no higher density resource, prune all but the resource with the next lowest density relative to the preferred density. bug:11224465 Change-Id: I99b3950fe3d8116a5625968ed383442315ae8526
* AAPT emits error for res with no 'default' productAdam Lesinski2013-10-041-4/+65
| | | | | | | | | Rather than ignoring resources that do not match the specified product, we keep track of the ignored ones and make sure that some variant of the resource that matches the product was processed. bug:10860838 Change-Id: I804cd04a053269a35b7e1c1cc743b77493337bf9
* Add badging of Payment appsAdam Lesinski2013-09-271-11/+142
| | | | | | | | HCE apps that declare themselves as payment apps will receive that badge when running aapt dump badging. bug:10899864 Change-Id: I7c095214412465ad7a925285d6167e12de16b600
* Add support for dumping new badgingAdam Lesinski2013-09-271-3/+68
| | | | | | | | APKs with AccessibilityServices, PrintServices, and or DeviceAdmin will have those services dumped when running 'aapt dump badging'. bug:10899864 Change-Id: I9c1f1f36c397b128dca802510368573a54977459
* Added support for supports-input manifest elementMichael Wright2013-09-051-50/+87
| | | | Change-Id: Ifa7c87908081585c1940b5a47fdf5138a287d9ea
* Transition API changes from API council recommendationsChet Haase2013-09-041-26/+1
| | | | | | | Issue #10460684 KLP API Review: android.view.transition and android.animation Issue #10570740 Transitions: inflate transition targets from xml Change-Id: I7a3f6d3aece2fcafc5efd555d033f79e86635c98
* am 9516ed45: am cfc23ac6: Merge "Add support for MNC=00"Wink Saville2013-07-301-0/+3
|\ | | | | | | | | * commit '9516ed4598948eea5623c57e443bce08c1f48ab6': Add support for MNC=00
| * Add support for MNC=00Mattias Petersson2013-07-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for operators with MNC (Mobile Network Code) zero to add customized resources. For example, it makes it possible to add a folder called "/res/values-mnc00/" in an application. This will cause resources in that folder to be used when MNC is zero. (There is a total of 14 countries that have an operator with MNC zero.) Without this fix, the resource framework gets confused, because MNC 0 is normally used when the MNC is undefined (not set). Bug: 7170488 Change-Id: Icfd39fd0c739216e89446252ea0e7ceba6f002c6
| * am bd1730de: Merge "Document the \'aapt dump strings\' command"Christopher Tate2013-04-291-0/+1
| |\ | | | | | | | | | | | | * commit 'bd1730dec7356e042ee885ff4a63b40f36733062': Document the 'aapt dump strings' command
* | | Move input library code to frameworks/native.Jeff Brown2013-07-011-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | No longer compile libandroidfw as a static library on the device since it already exists as a shared library. Keeping the static library would force us to provide a static library version of libinput for the device as well which doesn't make sense. Change-Id: I3517881b87b47dcc209d80dbd0ac6b5cf29a766f
* | | Switch to shared libpng/libz dependency.Stephen Hines2013-06-261-3/+5
| | | | | | | | | | | | | | | Bug: 9593270 Change-Id: I1eec2590cca046d6e030c73d31a6b400019e1ebd
* | | Merge "aapt: move qsort_r_compat here as it is sole client"Dima Zavin2013-05-084-2/+132
|\ \ \
| * | | aapt: move qsort_r_compat here as it is sole clientDima Zavin2013-05-074-2/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code is only used on the host for MacOS X compatibility. Apparently, glibc and Apple's libc disagree on the parameter ordering. Change-Id: I214edcf2870b6ac88316306ac5af43f1dadf9b2e Signed-off-by: Dima Zavin <dima@android.com>
* | | | libutils clean-upMathias Agopian2013-05-077-3/+296
|/ / / | | | | | | | | | Change-Id: I11ee943da23a66828455a9770fc3c5ceb4bbcaa9
* | | Merge commit 'b3f66877' into afdmergeJeff Sharkey2013-04-291-0/+1
|\ \ \ | | |/ | |/| | | | Change-Id: I319863cf23b2e6eacfa4508f7b111fba7b1cbc24
| * | Document the 'aapt dump strings' commandMårten Kongstad2013-04-291-0/+1
| | | | | | | | | | | | | | | | | | | | | Update the usage page for aapt to mention 'strings' as a valid subcommand to 'dump'. Change-Id: Iadb2b8ce36951ff36ffbf6b5ea349ba1e2b12582
| * | am ba1992f8: Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-devJustin Koh2013-01-161-19/+0
| |\ \ | | | | | | | | | | | | | | | | * commit 'ba1992f8e9e50ca58f007ff528d2f6d2c2b18223': Remove doSingleCrunch call DO NOT MERGE
| | * | Remove doSingleCrunch call DO NOT MERGEJustin Koh2013-01-161-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove doSingleCrunch call as it's breaking jb-mr1-aah-dev. Change-Id: I0d8ee55344792fd868e74e07f31641a85e71168a
* | | | Merge "Allow compiling aapt for the device"Bjorn Bringert2013-04-294-6/+167
|\ \ \ \
| * | | | Allow compiling aapt for the deviceBjorn Bringert2013-04-264-6/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - The static device version of libandroidfw now includes the extra functions needed by aapt. I could only find a few host tools that use the static library, so this is hopefully not a problem. - The pseudolocalization code is moved into aapt. It was previously in libhost, but only used by aapt. Change-Id: Ib393ebb7dcebee8abbb628cbe5255ea1679674ac
* | | | | am eb6403e9: resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aospJeff Brown2013-04-261-59/+55
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | * commit 'eb6403e95d601b62be7b4610599e72fd329f2666': Generate SDK docs for v7 support library packages.
| * | | 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
* | | | First draft of Scenes & Transitions featureChet Haase2013-04-181-0/+51
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This checkin has preliminary API (in flux, definitely changes still to be made) and implementation for a new "Scenes & Transitions" feature. The current implementation allows you to define different Scenes (via layout resource IDs or callbacks) and Transitions to be used when changing to those scenes. By default, scene changes will use AutoTransition, which generally does the right thing. There are no overview docs or tutorials yet. The best way to learn how things work is to see the code for the various tests in frameworks/base/tests/TransitionTests. Expect the API to change. Expect the implementation to change (mostly to add more functionality). Expect bugs, but tell me if things do not work as expected. Change-Id: Ib025a9f565678b225afa4759325cf6d496cc7215
* | | 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.
generated by cgit v1.1 at 2025-03-31 04:19:22 +0000