summaryrefslogtreecommitdiff
path: root/tools/aapt/Command.cpp
AgeCommit message (Collapse)Author
2010-03-09Add ability for some manifest attributes to reference resources.Dianne Hackborn
This loosens our restriction on many manifest attributes requiring literal string values, to allow various ones to use values from resources. This is only allowed if the resource value does not change from configuration changes, and the restriction is still in place for attributes that are core to security (requesting permissions) or market operation (used libraries and features etc). Change-Id: I4da02f6a5196cb6a7dbcff9ac25403904c42c2c8
2010-03-01Fix issue #2448075: aapt doesn't fix up activity-alias ↵Dianne Hackborn
android:targetActivity links And related: - The aapt tool now sets a resource configurations sdk level to match any configs that have been set (for example if you specify density your sdk level will be at least 4). - New option to modify the targetPackage attribute of instrumentation. - Clean up of aapt options help. - Fix of UI type values to leave 0 for "unspecified". - Make the UI mode config APIs public.
2010-02-12Dump original-package entries.Jeff Hamilton
Change-Id: I29b20811847555ff9858ef47cca69c8b992b24ea
2010-01-07am ce56857e: am cb2d50d0: Fix issue #2357259: aapt tool prints ↵Dianne Hackborn
"uses-configuation:" Merge commit 'ce56857ef72538c197afd91b9f30dc868d2667d9' * commit 'ce56857ef72538c197afd91b9f30dc868d2667d9': Fix issue #2357259: aapt tool prints "uses-configuation:"
2010-01-06am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configuation:"Dianne Hackborn
Merge commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8' into eclair-plus-aosp * commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8': Fix issue #2357259: aapt tool prints "uses-configuation:"
2010-01-06Fix issue #2357259: aapt tool prints "uses-configuation:"Dianne Hackborn
Change-Id: Id3ea3a86bd4d385441b05fcbe85b8ab62c35afff
2009-12-10am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2Jean-Baptiste Queru
Merge commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453' into eclair-mr2-plus-aosp * commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453': Add --custom-package to aapt
2009-12-10resolved conflicts for merge of ce307f88 to eclair-mr2Jean-Baptiste Queru
2009-12-09am ce307f88: Merge change Ie4cdb5a3 into eclairXavier Ducrohet
Merge commit 'ce307f889b509143899a2221359219fbc91b618c' into eclair-plus-aosp * commit 'ce307f889b509143899a2221359219fbc91b618c': Add --custom-package to aapt
2009-12-09am e6c0e993: Merge change I129483f8 into eclair-mr2Kenny Root
Merge commit 'e6c0e99334bc2f47e5d36db253ac8f166047c03b' into eclair-mr2-plus-aosp * commit 'e6c0e99334bc2f47e5d36db253ac8f166047c03b': Optional use of UTF-8 strings in resource bundles
2009-12-07Optional use of UTF-8 strings in resource bundlesKenny Root
Allows the use of UTF-8 for packing resources instead of the default of UTF-16 for Java. When strings are extracted from the ResStringPool, they are converted to UTF-16 and the result is cached for subsequent calls. When using aapt to package, add in the "-8" switch to pack the resources using UTF-8. This will result in the value, key, and type strings as well as the compiled XML string values taking significantly less space in the final application package in most scenarios. Change-Id: I129483f8b3d3b1c5869dced05cb525e494a6c83a
2009-11-30Add --custom-package to aaptXavier Ducrohet
This is needed to add library support to the SDK. The goal is to have libraries and main project use the same package for the R/Manifest classes to that they can share code and resources. BUG 2293994 Change-Id: Ie4cdb5a3bdabe1760a91316fd8969e4f53344bf9
2009-10-20am 617262d8: Merge change I37c4157d into eclairDoug Zongker
Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-plus-aosp * commit '617262d8f57362536ddc00a070c1c0994741de44': add "junk path" -k option to aapt (DO NOT MERGE)
2009-10-19add "junk path" -k option to aapt (DO NOT MERGE)Doug Zongker
Adds a "junk path" option to aapt so that you can do: aapt add -k archive.zip path/to/some.file and have the file stored in the zip under the name "some.file" (without the path). Needed so that we can use 'aapt add' in place of 'zip -j' when building jar files, which will lead to smaller incremental OTAs. (This is a cherry-pick of a change already submitted to eclair-mr2; the change was approved for mr1.)
2009-10-13am afbf8afa: Merge change I564b5b00 into eclair-mr2Doug Zongker
Merge commit 'afbf8afa858a78b66c19f11cfda030e913b34085' into eclair-mr2-plus-aosp * commit 'afbf8afa858a78b66c19f11cfda030e913b34085': add "junk path" -k option to aapt
2009-10-13add "junk path" -k option to aaptDoug Zongker
Adds a "junk path" option to aapt so that you can do: aapt add -k archive.zip path/to/some.file and have the file stored in the zip under the name "some.file" (without the path). Needed so that we can use 'aapt add' in place of 'zip -j' when building jar files, which will lead to smaller incremental OTAs.
2009-09-20am f1871e27: Merge change 26009 into eclairSuchi Amalapurapu
Merge commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112' into eclair-plus-aosp * commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112': Fix issue with printing gles version in aapt dump badging option
2009-09-20Fix issue with printing gles version in aapt dump badging optionSuchi Amalapurapu
If the name attribute for uses-feature or uses-permission is empty the error value is still empty indicating error and preventing the else part from being checked as it should be.
2009-09-04merge from open-source masterJean-Baptiste Queru
2009-09-03merge from donutJean-Baptiste Queru
2009-09-01Fix %p vs %s typo in aapt messageKenny Root
When trying to print an xmltree or xmlstrings from aapt, the error message if the resource didn't exist erroneously printed a pointer instead of a string. Change-Id: I317bbbdc1200e0f10922e80a36e41a22b2d50d0d
2009-08-31donut snapshotJean-Baptiste Queru
2009-08-30Add a flag (-G) to aapt to have it output the classes that shouldn't be ↵Joe Onorato
obfuscated by ProGuard.
2009-08-27Add platform infrastructure for features.Dianne Hackborn
This introduces a new mechanism to define features associated with a platform, query the current device for the available features, and enforce that apps requiring features that aren't available can't be installed. Also now allows uses-library to specify that a library is optional, so the lack of such a library will not prevent the app from being installed (but if it does exist it will be correctly linked into the app). Change-Id: I5b369b46cfa0b3d37c9e08fd14ef1098a978e67b
2009-08-27Fix issue #2084148: Define the format for the auto focus preview for barcode ↵Dianne Hackborn
scanning Add new manifest/aapt support for specifying device features an application requires. The aapt badging now returns these (as well as uses-permission since I need to look for those anyway); if an app doesn't explicitly request the camera feature but does request the permission, then aapt will say that it has requested both the basic camera feature as well as the autofocus feature. Here's what you put in your manifest to say you need a camera but don't need autofocus: <uses-permission android:name="android.permission.CAMERA" /> <uses-feature android:name="android.hardware.camera" /> <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" /> Here's what will be seen from aapt: uses-permission:'android.permission.CAMERA' uses-feature:'android.hardware.camera' uses-feature-not-required:'android.hardware.camera.autofocus' Change-Id: I4dd19cee0486cc54771f5bf14fc9db0e892115d5
2009-08-18Add aapt extensions to dump badging to print more info about activities, ↵Suchi Amalapurapu
receivers and services Fix issue with checking end tags. Earlier some boolean variables were being set once a new tag is detected at the same level which causes some incorrect values to be overwritten. we should be doing this when we detect the end tag.
2009-08-18am 75c49842: Add maxSdkVersion information in dump badging optionSuchi Amalapurapu
Merge commit '75c498426a17b47d445711bb9e36794b05876a56' into eclair * commit '75c498426a17b47d445711bb9e36794b05876a56': Add maxSdkVersion information in dump badging option
2009-08-14Add maxSdkVersion information in dump badging optionSuchi Amalapurapu
2009-07-21donut snapshotJean-Baptiste Queru
2009-06-29am 72eb0aca: Merge change 5483 into donutAndroid (Google) Code Review
Merge commit '72eb0acad5cffc57ce5006f6deab29ee259e461e' * commit '72eb0acad5cffc57ce5006f6deab29ee259e461e': Expand support for different screen sizes.
2009-06-26Expand support for different screen sizes.Dianne Hackborn
Applications can now declare that they support small, normal, or large screens. Resource selection can also be done based on these sizes. By default, pre-Donut apps are false for small and large, and Donut or later apps are assumed to support all sizes. In either case they can use <supports-screens> in their manifest to declare what they actually support.
2009-06-19am 1585bd24: Merge change 4828 into donutAndroid (Google) Code Review
Merge commit '1585bd24c10d16351f89e32dddbfa799f18db6bd' * commit '1585bd24c10d16351f89e32dddbfa799f18db6bd': Report densities in badging, debugging for nine patch bug.
2009-06-19Report densities in badging, debugging for nine patch bug.Dianne Hackborn
The aapt tool now reports all available densities like it already did for locales. Also this includes more resource data output, which I was using to examine bug #1867049 (which at this point I am unable to reproduce).
2009-06-05break dependency on utils/ZipEntry.h and utils/ZipFile.h, get rid of ↵Mathias Agopian
inet_address.h and Socket.h which were not used
2009-05-31get rid of utils.hMathias Agopian
2009-05-18Update aapt badging for native code, configs, density, etc.Dianne Hackborn
2009-04-02AI 144309: am: CL 144308 aapt extensions: required sdk version, dependent ↵Suchi Amalapurapu
software libraries, gadgets Add new attributes for sdk version, software libs and gadgets BUG = 1730924 Original author: asuchitra Merged from: //branches/cupcake/... Automated import of CL 144309
2009-04-02AI 144308: aapt extensions: required sdk version, dependent software ↵Suchi Amalapurapu
libraries, gadgets Add new attributes for sdk version, software libs and gadgets BUG = 1730924 BUG=1730924 Automated import of CL 144308
2009-03-03auto import from //depot/cupcake/@135843The Android Open Source Project
2009-03-03auto import from //depot/cupcake/@135843The Android Open Source Project
2009-01-15auto import from //branches/cupcake/...@126645The Android Open Source Project
2008-12-17Code drop from //branches/cupcake/...@124589The Android Open Source Project
2008-10-21Initial ContributionThe Android Open Source Project