History log of /frameworks/base/tools/aapt/Command.cpp
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
d831e80a2fa80d18867e70927e4e8cd797ead56f 27-Sep-2013 Adam Lesinski <adamlesinski@google.com> Add badging of Payment apps

HCE apps that declare themselves as payment apps will receive
that badge when running aapt dump badging.

bug:10899864
Change-Id: I7c095214412465ad7a925285d6167e12de16b600
/frameworks/base/tools/aapt/Command.cpp
b1249b822cef4e187814b83ae788f71842b88c28 26-Sep-2013 Adam Lesinski <adamlesinski@google.com> Add support for dumping new badging

APKs with AccessibilityServices, PrintServices, and or DeviceAdmin
will have those services dumped when running 'aapt dump badging'.

bug:10899864
Change-Id: I9c1f1f36c397b128dca802510368573a54977459
/frameworks/base/tools/aapt/Command.cpp
eaeb19048672337714c1724de7992be8cb3f2124 06-Sep-2013 Michael Wright <michaelwr@google.com> Added support for supports-input manifest element

Change-Id: Ifa7c87908081585c1940b5a47fdf5138a287d9ea
/frameworks/base/tools/aapt/Command.cpp
1bcc3d691fd1cb68abced62caf3024e2bb228561 03-Apr-2013 Nick Kralevich <nnk@google.com> aapt: add support for optional uses-permission

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
/frameworks/base/tools/aapt/Command.cpp
ec559ff78caa16cffcc7b9d688fe911e8945e17d 26-Feb-2013 Dianne Hackborn <hackbod@google.com> Fix typo.

Change-Id: I71c8458e02dc9b9a4c59e51ded37b57a930038f9
/frameworks/base/tools/aapt/Command.cpp
b7de2194d54eb81b1db4b50c171ddd0339831155 16-Jan-2013 Xavier Ducrohet <xav@android.com> resolved conflicts for merge of c71c678e to master

Change-Id: I9e1a6a1151af00f0a13e2010776276b240e0ac3a
6080cc5fd7c332c79098a50605c0c37d99d4c481 15-Jan-2013 Xavier Ducrohet <xav@android.com> resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev

Change-Id: I839981af97e54c39f0ea0b8141a4dd02959263a0
c75d3f5c10bf6d7718ef69c6bbc1cdf64cd8ff04 15-Jan-2013 Xavier Ducrohet <xav@android.com> Fix the single crunch command to return the right error code.

Casting from status_t to int doesn't work for return values
if the lower 8 bits are all 0.

Change-Id: I88e910dfe46cb72acd1595352e71da3c8eff4ca9
/frameworks/base/tools/aapt/Command.cpp
22d7cf239d8a9b009ea7adf86d8826a8a8116d03 21-Dec-2012 Xavier Ducrohet <xav@android.com> Add single crunch command to aapt. do not merge.

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
/frameworks/base/tools/aapt/Command.cpp
b1f6ad82dd8d1702617a757a88430604b3131fac 21-Dec-2012 Xavier Ducrohet <xav@android.com> Add single crunch command to aapt.

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
/frameworks/base/tools/aapt/Command.cpp
2bd8d0403be62df679f0f94ab4d84c9ae9a2e918 11-Jun-2012 Dianne Hackborn <hackbod@google.com> Fix issue #6641368: can't launch gallery

This is a revert of 1db36528b12395b9ed9bf8a1005a6d4ace737627,
but with comments added so I don't make this mistake again. :)

Change-Id: I053216279e3721f08f32f561bb989736ef619f82
/frameworks/base/tools/aapt/Command.cpp
002f53770a7f6850eab4d7e381e91dc94d28968f 26-Apr-2012 Ying Wang <wangying@google.com> Apply --extra-packages in case --custom-pacakge is also specified.

Cherry-picked from master.

Change-Id: I2d67b8821afdf064f4186ccd8def1b65f9a7dc88
/frameworks/base/tools/aapt/Command.cpp
4aa14b912fa7b0e8f2f1deb3e66dab4668de1e12 14-Apr-2012 Dianne Hackborn <hackbod@google.com> Add new aapt dump badging output explaining implicit badging.

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
/frameworks/base/tools/aapt/Command.cpp
4527a9242127c28ad9472ec3b7677b444b3ef215 11-Apr-2012 Dan Morrill <morrildl@google.com> Merge "Adding a line for android-debuggable to 'dump badging' if AndroidManifest.xml is configured as such. This is to be used by e.g. Play Store to warn the developer that they are about to publish a security hole."
31b0e0e86ad061cd8005e80817bcad017e2d56dd 06-Apr-2012 Dianne Hackborn <hackbod@google.com> Implement call log permission compatibility.

If a pre-JellyBean application requests read/write contacts, it
will implicitly be given read/write call log.

Change-Id: I029db4b09fda737bb8fba4e1611355ebdbbfd34f
/frameworks/base/tools/aapt/Command.cpp
b6ec11ef372a498c4d5fd2317a015b808495a2ed 03-Apr-2012 Dan Morrill <morrildl@google.com> Adding a line for android-debuggable to 'dump badging' if AndroidManifest.xml
is configured as such. This is to be used by e.g. Play Store to warn the
developer that they are about to publish a security hole.

Change-Id: Ib6f8537462cbc00ed0504435bdeee2aae0c5b69b
/frameworks/base/tools/aapt/Command.cpp
7924512aa12c6af37d90e8ccfcdf04eb78a294a3 12-Mar-2012 Dianne Hackborn <hackbod@google.com> Add new READ_EXTERNAL_STORAGE permission.

Also adds some initial compatibility code for dealing with it.

Change-Id: I104bff11798349e4aaa6da9b7be787b257daa1bb
/frameworks/base/tools/aapt/Command.cpp
1644c6d7f4931d0b4fe7ea77c63b016af01a46d3 07-Feb-2012 Dianne Hackborn <hackbod@google.com> Only generate private symbols that are needed.

Change-Id: Icc4c86638db8429a387bf87c934cc712f807e213
/frameworks/base/tools/aapt/Command.cpp
6c997a9e880e08c354ffd809bd62df9e25e9c4d4 31-Jan-2012 Dianne Hackborn <hackbod@google.com> aapt now sorts the strings in the resource string pool.

In our current environment with very many translations, this can
save a lot of RAM -- for example over 200K in Gmail just by sorting
the strings in the Gmail .apk (not the framework).

Also add a new aapt command to print the contents of the resource
table string pool.

Change-Id: I1da037b3e2c377b890833ff57ab158965314ac48
/frameworks/base/tools/aapt/Command.cpp
e74763e26f760e8de23a4edfbe599a166ef6bb53 06-Jan-2012 Dan Morrill <morrildl@google.com> Minor tweak to console output.

Change-Id: I494910eda1d02f6bcff945b9a13c83767f2248b6
/frameworks/base/tools/aapt/Command.cpp
063a44e541335819b673fb1c20a338bbcaf3a3f5 08-Dec-2011 Kenny Root <kroot@google.com> Add aapt support for implicitly-granted permissions

Bug: 2363582
Bug: 2877343
Change-Id: Iff7b496fb845e45fe1be2317089a96f7d63ed223
/frameworks/base/tools/aapt/Command.cpp
e6b680364dd992907a8d2037685a2e500d188dfb 14-Oct-2011 Dianne Hackborn <hackbod@google.com> New aapt feature to do smarter filtering of configurations.

This adds a --preferred-configurations flag that specifies the
specific configurations you would like to have.

It is smarter than "-c" because it will avoid stripping a
configuration if that would result in there being no value
for the resource.

It is dumber than "-c" because it can't process as many kinds
of resources. It is really only intended for bitmaps and use
with density configs.

This required re-arranging AaptAssets to group files together
by config again, like they used to be. I think this hasn't
broken anything. Hopefully.

Change-Id: I4e9d12ff6e6dbd1abb8fd4cb1814c6674b19d0e5
/frameworks/base/tools/aapt/Command.cpp
56088a55ca6c9277f09040a7883117cb127e1e56 29-Sep-2011 Kenny Root <kroot@google.com> Add package-verifier to aapt dump badging

Print out the package-verifier information when printing out badging.

Change-Id: I9c79c163261d5d4f1094bda76d90b3ff6e1ce540
/frameworks/base/tools/aapt/Command.cpp
d98e1be20e1cca5c36c7e0344500d4a5574568aa 18-Aug-2011 Xavier Ducrohet <xav@android.com> am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names"

* commit 'f4750724cf8db972a052cb388dc9a39fc7aa6dd6':
Change generated dependency file names
b711f3f7ee0544685ef26a1a4b4755d5a6233dba 16-Aug-2011 Josiah Gaskin <josiahgaskin@google.com> Change generated dependency file names

This changes the name of the generated dependency files to R.java.d
and <ApkName>.ap_.d respectively.

Change-Id: I17e18770fc0d0a5d31c7b37b40ac1949f45ef13a
/frameworks/base/tools/aapt/Command.cpp
84be06e4ce0778fbf0c1ac72f94795ef8433439b 21-Jul-2011 Xavier Ducrohet <xav@android.com> resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp

Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602
a125c937de06b1cc43368743592f47513eb88b76 21-Jul-2011 Xavier Ducrohet <xav@android.com> resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe
8a39da80b33691b0c82458c3b7727e13ff71277e 07-Jun-2011 Josiah Gaskin <josiahgaskin@google.com> Added Caching for PreProcessed PNGs

Added a cache management system for pre-processed PNG files
along with unit tests. The cache system will be used if
the --no-crunch flag is passed to AAPT during the package
phase. The cache can be updated by a call to 'aapt crunch'
(see usage statement). Also put in benchmarking code.

Change-Id: I58271fb2ee2f5f9075fd74d4ff6f15e7afabd05c
/frameworks/base/tools/aapt/Command.cpp
9139868b6c5cb29b3665984225dceb0193fec31d 19-Jul-2011 Xavier Ducrohet <xav@android.com> am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java"

* commit 'ba6c98db8f21016f81ecac35bb0ea3c433044bb7':
Add dependency generation to Aapt for R.java
bf31250ba0858a2e72a3906a1f0216846683bc2e 19-Jul-2011 Xavier Ducrohet <xav@android.com> am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects"

* commit 'd5431ed5505a42e5e33c8bf7cc2ff72792979be9':
Copy once-created R.java into library projects
03589cc65355220e0a4a0c816189a9fa25cc81fc 28-Jun-2011 Josiah Gaskin <josiahgaskin@google.com> Add generation of dependency file for .ap_ package

Make Aapt generate a dependency file in the same directory as the
output ap_ file if the --generate-dependencies flag is set.
This dependency file can then be read by the ant exec loop task
to see whether to repackage resources.

Change-Id: I763679414daf76369700aa599c26dcf78d4de099
/frameworks/base/tools/aapt/Command.cpp
9bf34ca6f85309c65b0ebdf614cb8266401b49ba 14-Jun-2011 Josiah Gaskin <josiahgaskin@google.com> Add dependency generation to Aapt for R.java

Make Aapt generate a dependency file in the location specified
by RClassDir for R.java if the --generate-dependencies flag is set.
This dependency file is then read by the ant exec loop task
to see whether to recreate R.java.

Change-Id: I7152dac86b6ea0e448ef65e3a95694afe233c789
/frameworks/base/tools/aapt/Command.cpp
ce89f1531ed8b96b8b790b3f8b18dd4cf483f7f0 09-Jun-2011 Josiah Gaskin <josiahgaskin@google.com> Copy once-created R.java into library projects

This change adds functionality in Aapt to allow specification of
library projects to copy the generated R.java file into rather
than regenerating the file for each library project.

Change-Id: I05939d1dc875bd875be9298ca47cb639235070c6
/frameworks/base/tools/aapt/Command.cpp
f77ae6e65a7ab47e7ab0ee1536d708b6e56fe45b 16-Jun-2011 Dianne Hackborn <hackbod@google.com> New orientation handling. Only impacts SDK (aapt dump badging).

This is a new way of determining whether an application requires
specific orientations, done by looking at any requirements in its
activity tags. Note that this won't catch all possible issues,
because applications can still force an orientation through Java
APIs, but the vast majority of applications that actually require
a specific orientation should be doing it this way because it the
easiest way and the only way to cleanly launch into the app from
a different orientation without doing some serious activity tricks.

Change-Id: I11d32104f6bc3d2a72aeeff1ca150b8f1c9f5588
/frameworks/base/tools/aapt/Command.cpp
e289bff0ec2b1af4ba773e0c8d49d5fd46eb9921 14-Jun-2011 Dianne Hackborn <hackbod@google.com> Add new landscape and portrait orientation features.

Updates aapt to know about these. Also updates aapt badging to:

- No longer crash due to the change to how we match unspecified
configuration resources.
- Report the new "smallest screen" supported screen configs.
- Infer old screen size buckets based on new smallest width attrs.
- Report all of the different labels and icons in an app.

Change-Id: I7376042b817391bd070f549cebbc7f03be4635c8
/frameworks/base/tools/aapt/Command.cpp
00db2213bf82c04610137a36e9190003f712952c 14-Dec-2010 Dan Morrill <morrildl@google.com> am 0ccc8b73: am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread

* commit '0ccc8b7345eac0b507c221be47e55926cbda8957':
GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).
096b67f65510a5076f1f845f9e19dda2b30ea6bb 14-Dec-2010 Dan Morrill <morrildl@google.com> GL texture filtering changed from AND to OR, so rename tag name to match.
(<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs.
supports-screen).

Change-Id: I0f20aed7f95169d9adfc7fe128191eb6e49d116f
/frameworks/base/tools/aapt/Command.cpp
41a4833bf2603d4194e470f783531581dd532545 07-Nov-2010 Scott Main <smain@google.com> am 4da6efc8: am 46151652: Merge "fix xlarge support in aapt for gingerbread" into gingerbread

* commit '4da6efc8a3ecfcf46a8988ad1d277ae00ed1f58c':
fix xlarge support in aapt for gingerbread
d58fb97ddf052b3ceac921ac7e936af990392b2c 05-Nov-2010 Scott Main <smain@google.com> fix xlarge support in aapt for gingerbread

Change-Id: I4d8872fb839a6eadc538055215d4455af328846c
/frameworks/base/tools/aapt/Command.cpp
a0b46c9c441f017a2008ca8ee2c864987465996b 22-Oct-2010 Dianne Hackborn <hackbod@google.com> Implement issue #3116702: New manifest tags for supported screen sizes

Merged from GB.

Change-Id: I94730b54bcacd083f77708e84c35f4932a7b9d2e
/frameworks/base/tools/aapt/Command.cpp
a6d9c7c04c4b17d85ac70f4494777555655f3be1 22-Oct-2010 Dianne Hackborn <hackbod@google.com> Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE

Change-Id: Iabf64d86c89d387ffbfbc39f950d308a73fe17eb
/frameworks/base/tools/aapt/Command.cpp
1785627fb36a93a1cbc69a048de6ed6412f83de9 15-Oct-2010 Dan Morrill <morrildl@google.com> am b58af2b8: am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread

Merge commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0'

* commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0':
Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
6f51fc14d0c3df8f9153ae5df992cc2731f099c8 13-Oct-2010 Dan Morrill <morrildl@google.com> Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
filtering based on support for OpenGL ES texture and texture compression
formats.

Change-Id: I993209a673579b296007ae2ba830d0275770dd11
/frameworks/base/tools/aapt/Command.cpp
f156e752b50ec3bfe013c6a7af6b1c16b0dfa611 03-Sep-2010 Dianne Hackborn <hackbod@google.com> am 31103928: am 192b56d4: Merge "Implement #2964234: Add support for <uses-package> element to aapt" into gingerbread

Merge commit '31103928ed5b9091bcd7de74c8a49675d10c87e7'

* commit '31103928ed5b9091bcd7de74c8a49675d10c87e7':
Implement #2964234: Add support for <uses-package> element to aapt
43b6803095e41e6a1cf844a77813c6cdbdc84ec3 03-Sep-2010 Dianne Hackborn <hackbod@google.com> Implement #2964234: Add support for <uses-package> element to aapt

Change-Id: Ifb381f387cab7e5a99006691e330d0e3d9d0f250
/frameworks/base/tools/aapt/Command.cpp
dc059804666c35abf51d09481f2fe5516339fcc6 26-Aug-2010 Kenny Root <kroot@google.com> am eb0e0f46: am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into gingerbread

Merge commit 'eb0e0f465155bc9ec2c79741890fb65bd403e33a'

* commit 'eb0e0f465155bc9ec2c79741890fb65bd403e33a':
Add LFH offset to verbose list of APK
fb2a9467ad77336edbf2a1a272dbe6ec30ef8a1b 25-Aug-2010 Kenny Root <kroot@google.com> Add LFH offset to verbose list of APK

The Local File Header (LFH) offset is printed in debugging cases when
the platform is inspecting APKs. This adds the LFH offset field to the
list of contents of an APK, so that it can be checked easily against the
Central Directory (CD).

Change-Id: I08f9a13256bfe6563c1a963c4f0289789b2e7857
/frameworks/base/tools/aapt/Command.cpp
cc5239b78b7d418d78d00bf9ee92192ccd851cda 24-Aug-2010 Dianne Hackborn <hackbod@google.com> am 8b569c8d: am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gingerbread

Merge commit '8b569c8d49924d849793513a5418ef0350320962'

* commit '8b569c8d49924d849793513a5418ef0350320962':
Fix aapt dump badging to support xlarge screens.
f43489d7d5e1c0c5c9a7e54c22845fcb99765f81 20-Aug-2010 Dianne Hackborn <hackbod@google.com> Fix aapt dump badging to support xlarge screens.

Change-Id: Ieeb757cd48ad9b3f46c5e4aed9d5efaeac834049
/frameworks/base/tools/aapt/Command.cpp
f1ff21ac62a51f5ba8ca0821ea8a90f70957e25d 14-Jun-2010 Steve Block <steveblock@google.com> Fixes a few minor problems with AAPT

- Fixes casting problems with stricter compilers
- Adds a couple of missing ifdef guards

This is a first step toward being able to generate APKs on the fly on the device.

Bug: 2766918
Change-Id: Icaaee5a4032afa313256add321b447443861dd85
/frameworks/base/tools/aapt/Command.cpp
6b22d81aa35d9a9b32670995c002e92588b2fe09 16-Jun-2010 Dan Morrill <morrildl@google.com> As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be
presumed to require Bluetooth just because they take the permission.

Change-Id: Ia629e9ef0425a577e4e14f9b348f5aa2b39c1e74
/frameworks/base/tools/aapt/Command.cpp
89d97c1418c7a8b54fd57cc90daa1b1a98848bf6 04-May-2010 Dan Morrill <morrildl@google.com> Adding the backward-compatible filtering heuristics for the new device
features definitions added in FroYo.

Change-Id: I5024e45c62813fe2fd2ff4d222df816a86a94f86
/frameworks/base/tools/aapt/Command.cpp
cf244ada58539ce857ec041d7288d0271204fbb6 10-Mar-2010 Dianne Hackborn <hackbod@google.com> Add ability for some manifest attributes to reference resources.

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
/frameworks/base/tools/aapt/Command.cpp
ef05e076ced1a32c5c0aaee28403779834adb2ba 02-Mar-2010 Dianne Hackborn <hackbod@google.com> Fix issue #2448075: aapt doesn't fix up activity-alias 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.
/frameworks/base/tools/aapt/Command.cpp
e2c17f9174144a6eca3fdbed8d5d1370f318f549 12-Feb-2010 Jeff Hamilton <jham@android.com> Dump original-package entries.

Change-Id: I29b20811847555ff9858ef47cca69c8b992b24ea
/frameworks/base/tools/aapt/Command.cpp
93cee56d87ef9571e7f535d0bf356b160d5f6710 07-Jan-2010 Dianne Hackborn <hackbod@google.com> am ce56857e: am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configuation:"

Merge commit 'ce56857ef72538c197afd91b9f30dc868d2667d9'

* commit 'ce56857ef72538c197afd91b9f30dc868d2667d9':
Fix issue #2357259: aapt tool prints "uses-configuation:"
ce56857ef72538c197afd91b9f30dc868d2667d9 06-Jan-2010 Dianne Hackborn <hackbod@google.com> am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configuation:"

Merge commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8' into eclair-plus-aosp

* commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8':
Fix issue #2357259: aapt tool prints "uses-configuation:"
cb2d50d0d6e2e37ae02b014999da23ecd32038b8 06-Jan-2010 Dianne Hackborn <hackbod@google.com> Fix issue #2357259: aapt tool prints "uses-configuation:"

Change-Id: Id3ea3a86bd4d385441b05fcbe85b8ab62c35afff
/frameworks/base/tools/aapt/Command.cpp
926d1a22007d94ef2b29ec979ab6038fa8d9e40e 11-Dec-2009 Jean-Baptiste Queru <jbq@google.com> am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2

Merge commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453' into eclair-mr2-plus-aosp

* commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453':
Add --custom-package to aapt
a5a8cc13d3f906650a1eb17e20e1b26d68b78453 11-Dec-2009 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of ce307f88 to eclair-mr2
9af0c6facbbc86acba23ca0937fb94842d0c10c6 10-Dec-2009 Xavier Ducrohet <xav@android.com> am ce307f88: Merge change Ie4cdb5a3 into eclair

Merge commit 'ce307f889b509143899a2221359219fbc91b618c' into eclair-plus-aosp

* commit 'ce307f889b509143899a2221359219fbc91b618c':
Add --custom-package to aapt
5cd6fcd518d47d1974a10fccf3c3d5431a83307a 10-Dec-2009 Kenny Root <kroot@google.com> am e6c0e993: Merge change I129483f8 into eclair-mr2

Merge commit 'e6c0e99334bc2f47e5d36db253ac8f166047c03b' into eclair-mr2-plus-aosp

* commit 'e6c0e99334bc2f47e5d36db253ac8f166047c03b':
Optional use of UTF-8 strings in resource bundles
19138468caf7050d482dc15f35a344eab11bb756 04-Dec-2009 Kenny Root <kroot@google.com> Optional use of UTF-8 strings in resource bundles

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
/frameworks/base/tools/aapt/Command.cpp
63459ad555c10de1f316d6de01fc3cd0c0aaa457 01-Dec-2009 Xavier Ducrohet <xav@android.com> Add --custom-package to aapt

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
/frameworks/base/tools/aapt/Command.cpp
16b696af615447dd98c2291e5b6bffeb5a723278 20-Oct-2009 Doug Zongker <dougz@android.com> am 617262d8: Merge change I37c4157d into eclair

Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-plus-aosp

* commit '617262d8f57362536ddc00a070c1c0994741de44':
add "junk path" -k option to aapt (DO NOT MERGE)
37c4157d7cdad71dc9abc93d652e81c33e346d93 20-Oct-2009 Doug Zongker <dougz@android.com> add "junk path" -k option to aapt (DO NOT MERGE)

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.)
/frameworks/base/tools/aapt/Command.cpp
b80d1d0cc8b75b9e51c94169892f1d03cdcd788a 13-Oct-2009 Doug Zongker <dougz@android.com> am afbf8afa: Merge change I564b5b00 into eclair-mr2

Merge commit 'afbf8afa858a78b66c19f11cfda030e913b34085' into eclair-mr2-plus-aosp

* commit 'afbf8afa858a78b66c19f11cfda030e913b34085':
add "junk path" -k option to aapt
dbe7a68cc13ae135b33769918932838d2d447169 09-Oct-2009 Doug Zongker <dougz@android.com> add "junk path" -k option to aapt

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.
/frameworks/base/tools/aapt/Command.cpp
e8e977bc4a5031da623188a562a1276305a7bf21 20-Sep-2009 Suchi Amalapurapu <asuchitra@google.com> am f1871e27: Merge change 26009 into eclair

Merge commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112' into eclair-plus-aosp

* commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112':
Fix issue with printing gles version in aapt dump badging option
40b94725dc1c62ea66db0b9502dd81b97dd3e35f 20-Sep-2009 Suchi Amalapurapu <asuchitra@google.com> Fix issue with printing gles version in aapt dump badging option
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.
/frameworks/base/tools/aapt/Command.cpp
3c193a4a8d748faf420988250aabda0145e74bf7 04-Sep-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
be8e36e32b9cb2bb37e28e4c0d414ee0e46c84a2 04-Sep-2009 Jean-Baptiste Queru <jbq@google.com> merge from donut
44b283dc27ed8ba5a946d809489f29b4ae88cb15 02-Sep-2009 Kenny Root <kenny@the-b.org> Fix %p vs %s typo in aapt message

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
/frameworks/base/tools/aapt/Command.cpp
72b1f379d5c97c8ff31d2201e78215af777d6bda 31-Aug-2009 Jean-Baptiste Queru <jbq@google.com> donut snapshot
/frameworks/base/tools/aapt/Command.cpp
1553c82e084ac5763fb393857224145506771b99 30-Aug-2009 Joe Onorato <joeo@android.com> Add a flag (-G) to aapt to have it output the classes that shouldn't be obfuscated by ProGuard.
/frameworks/base/tools/aapt/Command.cpp
49237345d83e62fdb9eb8d50b13ad086636a04fa 28-Aug-2009 Dianne Hackborn <hackbod@google.com> Add platform infrastructure for features.

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
/frameworks/base/tools/aapt/Command.cpp
e5276a74746b5e8f09b05a50155e7aa0bbb4a747 28-Aug-2009 Dianne Hackborn <hackbod@google.com> Fix issue #2084148: Define the format for the auto focus preview for barcode 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
/frameworks/base/tools/aapt/Command.cpp
1b125980c5de597c18a179b9b02b9a5afe106895 18-Aug-2009 Suchi Amalapurapu <asuchitra@google.com> Add aapt extensions to dump badging to print more info about activities, 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.
/frameworks/base/tools/aapt/Command.cpp
6919f69281e32d0c3d4b3791b273f71f178cbb7c 18-Aug-2009 Suchi Amalapurapu <asuchitra@google.com> am 75c49842: Add maxSdkVersion information in dump badging option

Merge commit '75c498426a17b47d445711bb9e36794b05876a56' into eclair

* commit '75c498426a17b47d445711bb9e36794b05876a56':
Add maxSdkVersion information in dump badging option
75c498426a17b47d445711bb9e36794b05876a56 15-Aug-2009 Suchi Amalapurapu <asuchitra@google.com> Add maxSdkVersion information in dump badging option
/frameworks/base/tools/aapt/Command.cpp
cf4550c3198d6b3d92cdc52707fe70d7cc0caa9f 21-Jul-2009 Jean-Baptiste Queru <jbq@google.com> donut snapshot
/frameworks/base/tools/aapt/Command.cpp
f6ff591decdea6299aab1a5b6f95917800571de4 30-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 72eb0aca: Merge change 5483 into donut

Merge commit '72eb0acad5cffc57ce5006f6deab29ee259e461e'

* commit '72eb0acad5cffc57ce5006f6deab29ee259e461e':
Expand support for different screen sizes.
723738cfaec3dd7b0fe152c872c41bebf94074c4 26-Jun-2009 Dianne Hackborn <hackbod@google.com> Expand support for different screen sizes.

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.
/frameworks/base/tools/aapt/Command.cpp
fc68623c03439db95401a18a435dbc491cd7f6fd 20-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 1585bd24: Merge change 4828 into donut

Merge commit '1585bd24c10d16351f89e32dddbfa799f18db6bd'

* commit '1585bd24c10d16351f89e32dddbfa799f18db6bd':
Report densities in badging, debugging for nine patch bug.
e17086ba346009a26cc2299b133a0fe602acb6ec 20-Jun-2009 Dianne Hackborn <hackbod@google.com> Report densities in badging, debugging for nine patch bug.

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).
/frameworks/base/tools/aapt/Command.cpp
55e3d60da5626752ffe1d15150d35ccb8fa644e7 05-Jun-2009 Mathias Agopian <mathias@google.com> break dependency on utils/ZipEntry.h and utils/ZipFile.h, get rid of inet_address.h and Socket.h which were not used
/frameworks/base/tools/aapt/Command.cpp
3b4062eeb01be33951ba214e027da523cf09f8b1 01-Jun-2009 Mathias Agopian <mathias@google.com> get rid of utils.h
/frameworks/base/tools/aapt/Command.cpp
bb9ea30ea9e390e69602935571795d2c80dc7b91 19-May-2009 Dianne Hackborn <hackbod@google.com> Update aapt badging for native code, configs, density, etc.
/frameworks/base/tools/aapt/Command.cpp
7ef189d0a90f3c9a409512ab7dce9304639df481 03-Apr-2009 Suchi Amalapurapu <> AI 144309: am: CL 144308 aapt extensions: required sdk version, dependent 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
/frameworks/base/tools/aapt/Command.cpp
633d8cddb81ed40b560fa475b8a74a9e41bb34f8 03-Apr-2009 Suchi Amalapurapu <> AI 144308: aapt extensions: required sdk version, dependent software libraries, gadgets
Add new attributes for sdk version, software libs and gadgets
BUG = 1730924
BUG=1730924

Automated import of CL 144308
/frameworks/base/tools/aapt/Command.cpp
9066cfe9886ac131c34d59ed0e2d287b0e3c0087 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/frameworks/base/tools/aapt/Command.cpp
d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/frameworks/base/tools/aapt/Command.cpp
9266c558bf1d21ff647525ff99f7dadbca417309 16-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@126645
/frameworks/base/tools/aapt/Command.cpp
f013e1afd1e68af5e3b868c26a653bbfb39538f8 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
/frameworks/base/tools/aapt/Command.cpp
54b6cfa9a9e5b861a9930af873580d6dc20f773c 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
/frameworks/base/tools/aapt/Command.cpp