summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Collapse)AuthorAgeFilesLines
* am 3c05f1fb: am b5fb50a1: Merge "Add instrumentation as a source tag for ↵Ying Wang2010-01-221-36/+44
|\ | | | | | | | | | | | | | | | | proguard keep options." into eclair Merge commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c' * commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c': Add instrumentation as a source tag for proguard keep options.
| * am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep ↵Ying Wang2010-01-191-36/+44
| |\ | | | | | | | | | | | | | | | | | | | | | | | | options." into eclair Merge commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace' into eclair-plus-aosp * commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace': Add instrumentation as a source tag for proguard keep options.
| | * Add instrumentation as a source tag for proguard keep options.Ying Wang2010-01-131-36/+44
| | |
* | | am b4f41119: am a1d08886: Merge "Only output proguard keep for nonempty ↵Ying Wang2010-01-121-23/+25
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | attribute name in the AndroidManifest.xml." into eclair Merge commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d' * commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d': Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
| * | am a1d08886: Merge "Only output proguard keep for nonempty attribute name in ↵Ying Wang2010-01-121-23/+25
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | the AndroidManifest.xml." into eclair Merge commit 'a1d08886ec8549878ad16c19754a3239706fb61b' into eclair-plus-aosp * commit 'a1d08886ec8549878ad16c19754a3239706fb61b': Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
| | * Only output proguard keep for nonempty attribute name in the ↵Ying Wang2010-01-121-23/+25
| | | | | | | | | | | | | | | | | | | | | AndroidManifest.xml. Before this change, aapt generates proguard keep flags like "-keep class com.android.somepackage.", which proguard doesn't recognize.
* | | am ce56857e: am cb2d50d0: Fix issue #2357259: aapt tool prints ↵Dianne Hackborn2010-01-071-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | "uses-configuation:" Merge commit 'ce56857ef72538c197afd91b9f30dc868d2667d9' * commit 'ce56857ef72538c197afd91b9f30dc868d2667d9': Fix issue #2357259: aapt tool prints "uses-configuation:"
| * | am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configuation:"Dianne Hackborn2010-01-061-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8' into eclair-plus-aosp * commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8': Fix issue #2357259: aapt tool prints "uses-configuation:"
| | * Fix issue #2357259: aapt tool prints "uses-configuation:"Dianne Hackborn2010-01-061-1/+1
| | | | | | | | | | | | Change-Id: Id3ea3a86bd4d385441b05fcbe85b8ab62c35afff
| * | am ce307f88: Merge change Ie4cdb5a3 into eclairXavier Ducrohet2009-12-093-6/+25
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'ce307f889b509143899a2221359219fbc91b618c' into eclair-plus-aosp * commit 'ce307f889b509143899a2221359219fbc91b618c': Add --custom-package to aapt
| * | am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdkDirk Dougherty2009-11-042-9/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5fc71e67498ed64ad2d41c23471b008f93cb580e' into eclair-plus-aosp * commit '5fc71e67498ed64ad2d41c23471b008f93cb580e': doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
| * \ \ am 617262d8: Merge change I37c4157d into eclairDoug Zongker2009-10-203-8/+22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-plus-aosp * commit '617262d8f57362536ddc00a070c1c0994741de44': add "junk path" -k option to aapt (DO NOT MERGE)
* | \ \ \ am 15f1bfb0: Merge change I70d0bddb into eclair-mr2Kenny Root2009-12-142-9/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '15f1bfb0d29915ed1790b22a00fd7032f035ddb0' into eclair-mr2-plus-aosp * commit '15f1bfb0d29915ed1790b22a00fd7032f035ddb0': Revise aapt options for UTF8/16 encoding
| * | | | | Revise aapt options for UTF8/16 encodingKenny Root2009-12-112-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove option to force UTF-8 encoding which could corrupt packages meant for systems before API level 7. Added switch to allow encoding for UTF-16 which will allow API 7 and later to encode resources in UTF-16. Change-Id: I70d0bddb0dfd12dcbd08c95f613dcfe896ae680b
* | | | | | am b5ef7ee1: Default to UTF8 resources when packaging with aaptKenny Root2009-12-102-3/+37
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3' into eclair-mr2-plus-aosp * commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3': Default to UTF8 resources when packaging with aapt
| * | | | | Default to UTF8 resources when packaging with aaptKenny Root2009-12-102-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes it so with API level 7 and above all resources will be packaged in UTF-8 format. Any minSdkVersion level that is named will also have resources packaged in UTF-8, because it is assumed that previous releases will only be rebuilt with their proper integer number and only future releases will temporarily have names. Change-Id: If5d1ee5e48fbaf31798816b068ac44b14a93121b
* | | | | | am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2Jean-Baptiste Queru2009-12-103-6/+25
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453' into eclair-mr2-plus-aosp * commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453': Add --custom-package to aapt
| * | | | | resolved conflicts for merge of ce307f88 to eclair-mr2Jean-Baptiste Queru2009-12-103-6/+25
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Add --custom-package to aaptXavier Ducrohet2009-11-303-6/+25
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am e6c0e993: Merge change I129483f8 into eclair-mr2Kenny Root2009-12-0910-23/+90
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e6c0e99334bc2f47e5d36db253ac8f166047c03b' into eclair-mr2-plus-aosp * commit 'e6c0e99334bc2f47e5d36db253ac8f166047c03b': Optional use of UTF-8 strings in resource bundles
| * | | | Optional use of UTF-8 strings in resource bundlesKenny Root2009-12-0710-23/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix bitmask in aapt's StringPool length constructionKenny Root2009-12-041-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The StringPool indicates the length of a string with a 16-bit integer. If the length of the string is greater than 0x7FFF, it splits it into two 16-bit integers with the first one having the high bit set. The length calculation has a small bug that masks off the 19 bits instead of the first 15 bits as intended.
* | | | am 0d55daff: am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdkDirk Dougherty2009-11-042-9/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '0d55daffc31c123dcf83f6db85f8198854ddc564' into eclair-mr2-plus-aosp * commit '0d55daffc31c123dcf83f6db85f8198854ddc564': doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
| * | | am 00e44ef2: Merge change I54545dfd into eclair-sdkDirk Dougherty2009-11-042-9/+9
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Merge commit '00e44ef21777f32b67a8d51ee375cd290a3fb2d4' into eclair * commit '00e44ef21777f32b67a8d51ee375cd290a3fb2d4': doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
| | * | doc change: fix broken R.styleable formatting (caused by missing periods). ↵Dirk Dougherty2009-11-032-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust table markup. Bug: 2230588 Change-Id: I54545dfd9d26acef567e586cfc916f6b883a4de7
| * | | add "junk path" -k option to aapt (DO NOT MERGE)Doug Zongker2009-10-193-8/+22
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.)
* | | am afbf8afa: Merge change I564b5b00 into eclair-mr2Doug Zongker2009-10-133-8/+22
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Merge commit 'afbf8afa858a78b66c19f11cfda030e913b34085' into eclair-mr2-plus-aosp * commit 'afbf8afa858a78b66c19f11cfda030e913b34085': add "junk path" -k option to aapt
| * | add "junk path" -k option to aaptDoug Zongker2009-10-133-8/+22
| |/ | | | | | | | | | | | | | | | | | | | | 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.
* | am 20b39471: Merge change 26933 into eclairRaphael2009-09-241-0/+4
|\ \ | |/ | | | | | | | | | | Merge commit '20b394719daa218be7ff767fad024504f12e937b' into eclair-plus-aosp * commit '20b394719daa218be7ff767fad024504f12e937b': AAPT: Ignore visual source safe files in resources
| * AAPT: Ignore visual source safe files in resourcesRaphael2009-09-241-0/+4
| | | | | | | | BUG 1895888
* | am f1871e27: Merge change 26009 into eclairSuchi Amalapurapu2009-09-201-2/+3
|\ \ | |/ | | | | | | | | | | Merge commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112' into eclair-plus-aosp * commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112': Fix issue with printing gles version in aapt dump badging option
| * Fix issue with printing gles version in aapt dump badging optionSuchi Amalapurapu2009-09-201-2/+3
| | | | | | | | | | | | 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.
* | am 7fc39b26: Merge change 25238 into eclairDianne Hackborn2009-09-152-1/+57
|\ \ | |/ | | | | | | | | | | Merge commit '7fc39b26fc4ec9df7d147ff34ebba90556cdb4da' into eclair-plus-aosp * commit '7fc39b26fc4ec9df7d147ff34ebba90556cdb4da': Implement issue #1780928: Need support hiding nav keys.
| * Implement issue #1780928: Need support hiding nav keys.Dianne Hackborn2009-09-152-1/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | This implements support for devices whose hardware can hide their navigation keys. It works much like the existing keyboardHidden configuration, and for compatibility uses the same configuration change bit. Also add FLAG_TURN_ON_SCREEN for windows, which has the system cause the screen to be turned on when the window is displayed. Great fun when used with FLAG_SHOW_WHEN_LOCKED! Change-Id: I0b867f19af85cfd8786a14cea194b34f7bdd9b7a
* | merge from open-source masterJean-Baptiste Queru2009-09-041-2/+2
|\ \
| * \ merge from donutJean-Baptiste Queru2009-09-031-0/+5
| |\ \
| | * | donut snapshotJean-Baptiste Queru2009-08-311-0/+5
| | | |
| * | | Fix %p vs %s typo in aapt messageKenny Root2009-09-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am e8f605ff: Merge change 23761 into eclairRobert Greenwalt2009-09-031-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Merge commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9' into eclair-plus-aosp * commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9': Fix compilation of add-resource tag.
| * | | Fix compilation of add-resource tag.Robert Greenwalt2009-09-021-1/+1
| | | | | | | | | | | | | | | | It used the wrong tag-type to find the end of itself.
* | | | am 66c70e13: Merge change 23529 into eclairEric Fischer2009-09-022-3/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e' into eclair-plus-aosp * commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e': Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
| * | | Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.Eric Fischer2009-09-012-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In practice, no one ever writes an apostrophe in an aapt string with the intent of using it to quote whitespace -- they always mean to include a literal apostrophe in the string and then are surprised when they find the apostrophe missing. Make this an error so that it is discovered right away instead of waiting until late in QA or after the strings have already been sent for translation. (And fix a recently-introduced string that has exactly this problem.) Silence the warning about an empty span in a string, since this seems to annoy people instead of finding any real problems. Make the error about having a translated string with no base string into a warning, since this is a big pain when making changes to an application that has already had some translations done, and the dead translations should be removed by a later translation import anyway.
* | | | merge from open-source masterJean-Baptiste Queru2009-09-011-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fix bitmask in aapt's StringPool length constructionKenny Root2009-08-211-1/+1
| |/ | | | | | | | | | | | | | | | | | | The StringPool indicates the length of a string with a 16-bit integer. If the length of the string is greater than 0x7FFF, it splits it into two 16-bit integers with the first one having the high bit set. The length calculation has a small bug that masks off the 19 bits instead of the first 15 bits as intended.
| * donut snapshotJean-Baptiste Queru2009-07-292-53/+137
| |
| * donut snapshotJean-Baptiste Queru2009-07-2110-68/+634
| |
| * donut snapshotJean-Baptiste Queru2009-05-201-1/+1
| |
| * AI 144950: Manual integration of 144342 and 144547 from donutburger to cupcake.Robert Greenwalt2009-04-072-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | Fix bag (string-array, etc) behavior with overlays. We used to replace elements in the default with elements from the overlay. This change causes us to empty the array first so if the overlay array is smaller we don't end up with elements from the default array showing through at the end of the final result. Ex: [A,B,C] default with [D] overlay should give [D] but used to give [D,B,C] BUG=1754390 Automated import of CL 144950
| * AI 144308: aapt extensions: required sdk version, dependent software ↵Suchi Amalapurapu2009-04-021-69/+142
| | | | | | | | | | | | | | | | | | | | libraries, gadgets Add new attributes for sdk version, software libs and gadgets BUG = 1730924 BUG=1730924 Automated import of CL 144308
* | Fix replacement-after-add of resource files in overlay.Robert Greenwalt2009-08-311-19/+45
| | | | | | | | | | | | | | | | | | | | Aapt was adding/removing elements from a list an continuing to use a stale copy for future indexes. This could cause incorrect subsequent processing. Add an en resource and modify an es, for example. Adding the en would cause the base fileset's es version to be moved in the list. Using the old index we'd then attempt to remove the old es version with the wrong index and then add the new es version generating a "duplicate file" error. bug: 2090015
generated by cgit v1.1 at 2025-01-11 07:00:17 +0000