History log of /frameworks/base/tools/aapt/Resource.cpp
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
0122a3db313d3a7b55e0dee5eae1d7798c0d55be 26-Sep-2012 Xavier Ducrohet <xav@android.com> Fix writing text version of styleable IDs. do not merge.

(cherry picked from commit d16047434bca24b2811de7ea9d22de6ee0f87f79)

Change-Id: Ic679080d5157daf77c35516c8f682bd13e2b4d96
/frameworks/base/tools/aapt/Resource.cpp
5de9603529ee01a416b5fa31074197565fde4482 17-Sep-2012 Xavier Ducrohet <xav@android.com> am 31820a35: Merge "Add --output-text-symbols option to aapt."

* commit '31820a35b2cf864a8dcb71d43e6fd21d54f49a2d':
Add --output-text-symbols option to aapt.
cc9747ed45302956a3ec9dd21f7b950b837dbfdd 17-Sep-2012 Xavier Ducrohet <xav@android.com> am d7252571: Merge "Add --error-on-failed-insert option to aapt."

* commit 'd72525718ea7ef3e1f97cf557365b143c8919a5b':
Add --error-on-failed-insert option to aapt.
f5de650ff1e161ea135c828e43515895343d2c0f 11-Sep-2012 Xavier Ducrohet <xav@android.com> Add --output-text-symbols option to aapt.

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
/frameworks/base/tools/aapt/Resource.cpp
7714a2429b192c88e134ff67b969121bbaeb5457 06-Sep-2012 Xavier Ducrohet <xav@android.com> Add --error-on-failed-insert option to aapt.

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
/frameworks/base/tools/aapt/Resource.cpp
095cd2e2d14e4fe25b66df54861fb66000a25adc 19-Jul-2012 Xavier Ducrohet <xav@android.com> Fix aapt -G to properly support class attr in fragment.

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
/frameworks/base/tools/aapt/Resource.cpp
9275197d35a99c3f187d18d0eda6ead3b8a32603 19-May-2012 Dianne Hackborn <hackbod@google.com> Add aapt support for generating proguard rules for onClick methods.

Also fix Activity menu inflater when using the dark on light
theme wrapper to still be able to find onClick listeners.

Change-Id: Ie206db26d1df96041bc477804e476b02ad99dc9d
/frameworks/base/tools/aapt/Resource.cpp
c0f7366a15655c6973ea21029f1997f24c006cca 17-Mar-2012 Jeff Brown <jeffbrown@google.com> aapt: Preprocess images in parallel.

Currently hardcoded to use up to 4 threads.

This change substantially reduces the amount of time spent
preprocessing framework resources to just a few seconds.

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

Change-Id: Icc4c86638db8429a387bf87c934cc712f807e213
/frameworks/base/tools/aapt/Resource.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/Resource.cpp
f51125d8429ffa71c57ba6fbdca9effc72642a9b 28-Oct-2011 Raphael <raphael@google.com> AAPT fix printf %zd crash on Windows.

There's no printf %zd on Mingw/Cygwin so the verbose
printf crashes aapt.

SDK bugs: 20395, 20986

Change-Id: I5b8ac36749263205a19f1448b1aaca90d5a2e06d
/frameworks/base/tools/aapt/Resource.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/Resource.cpp
1797d6086f9acbea582cac6d484e749abafa1868 18-Aug-2011 Xavier Ducrohet <xav@android.com> am d98e1be2: am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names"

* commit 'd98e1be20e1cca5c36c7e0344500d4a5574568aa':
Change generated dependency file names
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/Resource.cpp
ac1fe6f8460448d379721677a064868e103a2260 21-Jul-2011 Xavier Ducrohet <xav@android.com> am 84be06e4: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp

* commit '84be06e4ce0778fbf0c1ac72f94795ef8433439b':
Added Caching for PreProcessed PNGs
84be06e4ce0778fbf0c1ac72f94795ef8433439b 21-Jul-2011 Xavier Ducrohet <xav@android.com> resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp

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

* commit 'a125c937de06b1cc43368743592f47513eb88b76':
Add generation of dependency file for .ap_ package
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/Resource.cpp
c810fffe1ffda8876c083f10b5f2b3b197768809 19-Jul-2011 Xavier Ducrohet <xav@android.com> am 9139868b: am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java"

* commit '9139868b6c5cb29b3665984225dceb0193fec31d':
Add dependency generation to Aapt for R.java
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
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/Resource.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/Resource.cpp
45ccfa5870517374d06e1eec9f61947d8c00cb0d 21-Jun-2011 Ying Wang <wangying@google.com> Output Proguard options for also overlay layouts.

Change-Id: I7bfac476247bd7b532510e295cb1a3e61e9af88b
/frameworks/base/tools/aapt/Resource.cpp
b732b7b5e8192501360edc15fb8c6399d11fb97d 28-Feb-2011 Xavier Ducrohet <xav@android.com> am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."

* commit 'ce57a7f35344e76689d30f45964d1e37b78280cb':
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Fixed GSM encoded network initiated position request
Ensuring thread-safe usage of DateFormat.
Fixing infinite loop for zero duration.
Fix for an infinite loop while scrolling lists.
WAPPushManager, WAP Push over SMS message handler
Add --non-constant-id to aapt.
d06c1afbb920111d6bb77381560faa1fac5f2d69 15-Feb-2011 Xavier Ducrohet <xav@android.com> Add --non-constant-id to aapt.

This option enbables creating resource constant in the R class
that are not actual constant, but simply static fields.

The goal is to build library projects with these types of
IDs so that the constant does not get inlined in the library
code, since the ID for the library resources only are not
the final values.

The final resource IDs, generated from the main project and
its library(ies), will have proper constant with the final
values.

This allows us to generate binary library bundle (a jar file
and associated resources) that can be distributed. Additionally,
this will let us make the library project support in Eclipse
much more robust and a better user experience overall.

Change-Id: Ibe2f08d68493fde658fc3f7606abf7446f312ad2
/frameworks/base/tools/aapt/Resource.cpp
f31161a0e71c0446283610e9bf7a11e0be12bd5e 05-Jan-2011 Dianne Hackborn <hackbod@google.com> Add new "animator" and "interpolator" resource directories.

First phase, allowing apps to move over to the new names.

Change-Id: Ia16f3e2383e4a6599a0011d0464f0aacb1ce9207
/frameworks/base/tools/aapt/Resource.cpp
ddb76c4644756b31be948d70aaa8ee541dd94999 24-Nov-2010 Kenny Root <kroot@google.com> Change assets to use 64-bit API

The asset system and supporting libraries were using off_t instead of
off64_t to access files larger than 2GB (32-bit signed). This change
replaces all off_t with off64_t and lseek64.

There is a new utils/Compat.h added for Mac OS compatibility.

Also fixed some size-related compiler warnings.

Bug: 3205336
Change-Id: I9097b3cb7a602e811fe52f245939d8975da55e9e
/frameworks/base/tools/aapt/Resource.cpp
7c71023b7f5aafac09bd2f0425fccb5fe2d22b27 23-Nov-2010 Kenny Root <kroot@google.com> Add knowledge of mipmap to aapt

New mipmap drawable type that does not get filtered according to
configuration. Useful for things that get built as part of the system.

Change-Id: I556033d065e504079271dce79c23c90d3c387ce4
/frameworks/base/tools/aapt/Resource.cpp
f14fafdb7d107b1303e6c93e54b20d457195dca2 11-Sep-2010 Xavier Ducrohet <xav@android.com> am fa888784: am 89fef418: Merge "Avoid pre-processing images when they won\'t be used"

Merge commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b'

* commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b':
Avoid pre-processing images when they won't be used
fa8887848e2877dd96e853dfcd52086f1b66c26b 10-Sep-2010 Xavier Ducrohet <xav@android.com> am 89fef418: Merge "Avoid pre-processing images when they won\'t be used"

Merge commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9' into gingerbread-plus-aosp

* commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9':
Avoid pre-processing images when they won't be used
578a57fc6bba6d19e31e91961ef5a9e86b890e4b 01-Sep-2010 Anthony Newnam <anthony.newnam@garmin.com> Avoid pre-processing images when they won't be used

Change-Id: Iffa31228ca95a2e29ccc0aa81bda0fc66922d577
/frameworks/base/tools/aapt/Resource.cpp
8e9bfab2a3ce35b31350b8de18d024f4da6e3886 31-Aug-2010 Xavier Ducrohet <xav@android.com> Add a --debug-mode option to aapt.

When passed (with no needed parameters) to the aapt command line,
aapt will insert debuggable=true in the application node of the manifest
automatically.

This is to be used by the SDK tools to make true "debug" builds
that require no code/file change.

Change-Id: I909759caef499a91d10cc9a0902c6448c87e75ef
/frameworks/base/tools/aapt/Resource.cpp
d092f380021ca0520cc27b0272cd1a44d801d167 31-Aug-2010 Xavier Ducrohet <xav@android.com> am b4649ec7: am 23827557: Merge "Add a --debug-mode option to aapt." into gingerbread

Merge commit 'b4649ec720fa959b700a7a03c089bfdc61321d16'

* commit 'b4649ec720fa959b700a7a03c089bfdc61321d16':
Add a --debug-mode option to aapt.
6487b099231b1e5d36ae37a921399b028b3b3ad9 31-Aug-2010 Xavier Ducrohet <xav@android.com> Add a --debug-mode option to aapt.

When passed (with no needed parameters) to the aapt command line,
aapt will insert debuggable=true in the application node of the manifest
automatically.

This is to be used by the SDK tools to make true "debug" builds
that require no code/file change.

Change-Id: I6f0a7af7b7d51f26bb0ec012e6f142a6060b8618
/frameworks/base/tools/aapt/Resource.cpp
8a44bb23c1f12ba58d0cb5732e3e216d48e7ccdb 19-Aug-2010 Dianne Hackborn <hackbod@google.com> Update aapt to find fragment references.

Add knowledge about <fragment class="..."> for layout files
and update to reflect the change of the header tag from Header.

Change-Id: I91e2a5f204a8e222367985383c1721030c7954d8
/frameworks/base/tools/aapt/Resource.cpp
af4798d9c3e32229131fe7d74a61bc81ce4172fd 17-Aug-2010 Ying Wang <wangying@google.com> am 8cfd3c01: am e05184f2: Merge "Output proguard keep flags for fragment classes." into gingerbread

Merge commit '8cfd3c01e4582a587765588c02234527e7808ca0'

* commit '8cfd3c01e4582a587765588c02234527e7808ca0':
Output proguard keep flags for fragment classes.
561a91824fbfcdae9031fb2cdbb745578a969981 13-Aug-2010 Ying Wang <wangying@google.com> Output proguard keep flags for fragment classes.

Change-Id: I28c10fbf18b91f8ba3dfc2575cd41215f65f11ec
Bug: 2916847
/frameworks/base/tools/aapt/Resource.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/Resource.cpp
c9f3088036dd7cce6903e307afea3e289a334036 24-Mar-2010 Kenny Root <kroot@google.com> Use correct API version for UTF-8 checking

Use the constant for checking the API version in aapt instead of a bare
number.

Bug: 2541326
Change-Id: Ice7af7b393363a00f1832dd84753b8138d057fb4
/frameworks/base/tools/aapt/Resource.cpp
ed9830999aede5e827b31446f91ad90a37b8bba9 18-Mar-2010 Kenny Root <kroot@google.com> Make aapt warning concise

The previous warning made it seem like it could be using the value
specified on the command line, but, in fact, it would ignore the command
line value if it were already specified in the AndroidManifest.xml

Change-Id: I15e8161e094f17412680d25d3b7b810474eb4a31
/frameworks/base/tools/aapt/Resource.cpp
1741cd4904414b5b4e768953a8f1abb3f0ef0a0a 18-Mar-2010 Kenny Root <kroot@google.com> Fix minSdkVersion scanning to not throw warnings

For the UTF8/UTF16 switch code, we needed to know what was the
minSdkVersion specified as early as possible. Unfortunately, this threw
warnings when the SDK was compiling since we always set this field in
the Bundle.

This splits out the field used by the initial AndroidManifest.xml scan
to a separate one that we won't attempt to re-insert into the
AndroidManifest.xml This also switches the logic to better reflect the
preference of UTF-8 over UTF-16; previously UTF-16 was the default.

Change-Id: Ia81f6b21047043ebb711eb24c2c3718534979ef6
/frameworks/base/tools/aapt/Resource.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/Resource.cpp
83f4c0994fd34f9b35eeb2c14908d9e6c2e15930 05-Mar-2010 Xavier Ducrohet <xav@android.com> Fix potential aapt crash when processing overlay.

If an overlay has a type of resources that's not defined in
the main res pool, then aapt would crash.

This dynamically create new ResourceTypeSet when needed
when processing the overlays

Change-Id: I67bc3622281bde73cf42f37a0983798d3f658ce2
/frameworks/base/tools/aapt/Resource.cpp
b0381efaf71e917214cec78ed1c35eb688454e93 03-Mar-2010 Dianne Hackborn <hackbod@google.com> Fix issue #2485441: SettingsBackupAgent crashed system server

Need to take care of fixing up backupAdjust as well as reporting it
to ProGuard.
/frameworks/base/tools/aapt/Resource.cpp
abd03658bc4cd925bf89d60f49d0c56351cf08da 02-Mar-2010 Dianne Hackborn <hackbod@google.com> Fix issue #2482423: Settings is broken due to dead-code stripping

Take care of more custom classes in layouts, and also scan through
preference XMLs.
/frameworks/base/tools/aapt/Resource.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/Resource.cpp
7ff20e30c50cf1d47a7eaacd71665a1d2f4ecdc4 25-Feb-2010 Kenny Root <kroot@google.com> Create own reference for minSdkVersion in aapt

Fix bug where applications defining a minSdkVersion were experiencing
transient errors from memory corruption in aapt.

Change-Id: I839d5eda7388baac6133e735fa59f9799ca2822d
/frameworks/base/tools/aapt/Resource.cpp
5a8ec761213d723fc3a6a92250e5e855605046a6 25-Feb-2010 Kenny Root <kroot@google.com> Scan for android namespace in manifest

android:minSdkVersion wasn't being correctly scanned because the
namespace was incorrect. This fixes that problem so packages aren't
generated as UTF-8 when minSdkVersion is less than 7.

Change-Id: I8f45d47ea886915da6a4770f6e111e6085d61bee
/frameworks/base/tools/aapt/Resource.cpp
27b28b3f62bd3b54fa13acd5d035940b9be464f3 09-Feb-2010 Tobias Haamel <haamel@google.com> Introduce special UI modes for night and car usage.

The device mode is now called ui mode. Furthermore is the order of
precedence for the resources now in such a way that the ui mode needs
to be specified after the orientation and before the density.

The ui mode can be set, like it is done for the locale, as follows:

IActivityManager am = ActivityManagerNative.getDefault();
Configuration config = am.getConfiguration();
config.uiMode = Configuration.UI_MODE_TYPE_CAR | Configuration.UI_MODE_NIGHT_ANY;
am.updateConfiguration(config);

To allow users to disable the car mode and set the night mode the IUiModeManager
interface is used.

The automatic night mode switching will be added in a separate change.
/frameworks/base/tools/aapt/Resource.cpp
2fee0ed6eb99b211efa06f095a41268a2021214a 06-Jan-2010 Jeff Hamilton <jham@android.com> Add the --rename-manifest-package option to aapt.

It allows you to force override the manifest
package listed in the AndroidManifest.xml when
creating an APK file.

Change-Id: I7eac7943c4e56610b65728ae54773a273634fd9d
/frameworks/base/tools/aapt/Resource.cpp
15900779058611c1a082724486cb0a49c50ae606 28-Jan-2010 Ying Wang <wangying@google.com> am 6efe03b1: am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclair

Merge commit '6efe03b19e0734361b262f9a0be4d225088d7f9e'

* commit '6efe03b19e0734361b262f9a0be4d225088d7f9e':
Find layout classes in all "layout-*" dirs.
b70efcbbb1ae0672c43da86511daf49d177d8ed8 22-Jan-2010 Ying Wang <wangying@google.com> am 3c05f1fb: am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options." into eclair

Merge commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c'

* commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c':
Add instrumentation as a source tag for proguard keep options.
c111296b97d51147f8c9448c7c27b53309ee6f39 21-Jan-2010 Ying Wang <wangying@google.com> Find layout classes in all "layout-*" dirs.

Before this CL, the generated keep flags for layout classes are incomplete,
such as layout classes in res/layout-port/ and res/layout-land and so on.
/frameworks/base/tools/aapt/Resource.cpp
46f4b9827efaceb0ceae49f06130caa2d2b9743e 13-Jan-2010 Ying Wang <wangying@google.com> Add instrumentation as a source tag for proguard keep options.
/frameworks/base/tools/aapt/Resource.cpp
ffebd7c2cc267ee0c33378e0c3b3b0ff260ba150 13-Jan-2010 Ying Wang <wangying@google.com> am b4f41119: am a1d08886: Merge "Only output proguard keep for nonempty 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.
4199528aab2cbc3ba3c6540670fabb2040c8e081 13-Jan-2010 Ying Wang <wangying@google.com> Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.

Before this change, aapt generates proguard keep flags like
"-keep class com.android.somepackage.", which proguard doesn't recognize.
/frameworks/base/tools/aapt/Resource.cpp
b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3 10-Dec-2009 Kenny Root <kroot@google.com> Default to UTF8 resources when packaging with aapt

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
/frameworks/base/tools/aapt/Resource.cpp
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/Resource.cpp
59ad275e937bb3c32e59bc01d86f484e7b4bdbe1 04-Nov-2009 Dirk Dougherty <ddougherty@google.com> doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.

Bug: 2230588
Change-Id: I54545dfd9d26acef567e586cfc916f6b883a4de7
/frameworks/base/tools/aapt/Resource.cpp
832528f92c8d6995318777ead009da20963bcf7a 31-Aug-2009 Robert Greenwalt <robdroid@android.com> Fix replacement-after-add of resource files in overlay.

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
/frameworks/base/tools/aapt/Resource.cpp
56d8eeae6f863771d759448d45f7ce75aef73b21 31-Aug-2009 Joe Onorato <joeo@android.com> applications are at level 2
/frameworks/base/tools/aapt/Resource.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/Resource.cpp
4a51c20ce607c74914f90fd897f04080121ac13b 22-Aug-2009 Dianne Hackborn <hackbod@google.com> I am getting tired of the java doc warnings, so fix them.

Change-Id: I2205eebae419eaf4a0992c9f5b7cd807eb843fe1
/frameworks/base/tools/aapt/Resource.cpp
3547f859d4a4e90eea52e9caf686c69a6e015b85 14-Aug-2009 Daniel Sandler <dsandler@google.com> aapt now attempts to process all assets even if some are malformed.

Previously aapt would bail out on the first broken image, making it difficult to compile a comprehensive list of broken images. Now it will pre- and post-process all of them and report any and all errors (before exiting with an error code if any errors were encountered).

Bug: 2055485
/frameworks/base/tools/aapt/Resource.cpp
64551b2e0e52fe89c360b1951acc528d94ebaf7a 15-Aug-2009 Dianne Hackborn <hackbod@google.com> Fix aapt to be able to add configs from overlays.

Fixes a bug where any new configurations introduced in an overlay
would be half-way ignored (enough to result in a broken .apk).
/frameworks/base/tools/aapt/Resource.cpp
58c27a0a03f573791935116fa35f6a7c8bf93896 13-Aug-2009 Dianne Hackborn <hackbod@google.com> Allow overlays to add resources.
/frameworks/base/tools/aapt/Resource.cpp
dd931864209eac0b4182d7a0d1ca965fcc3b8c03 13-Jul-2009 Marco Nelissen <marcone@google.com> Format aapt warnings the same way as other compiler warnings
('warning: ' instead of 'WARNING: ' or 'WARNING ')
/frameworks/base/tools/aapt/Resource.cpp
641fa6c602258f15b5a484975ff9dd43e8d421c9 08-Jun-2009 Robert Greenwalt <robdroid@android.com> am fa5c7e1d: Catch when a file resource (non values) added in an overlay.

Merge commit 'fa5c7e1dfede7e26260789dd2de5175497e9659b'

* commit 'fa5c7e1dfede7e26260789dd2de5175497e9659b':
Catch when a file resource (non values) added in an overlay.
fa5c7e1dfede7e26260789dd2de5175497e9659b 06-Jun-2009 Robert Greenwalt <robdroid@android.com> Catch when a file resource (non values) added in an overlay.

File resources are assigned resource id's and if an overlay adds one
it renumbers things and breaks compatability. Used to segfault
if you tried before, but now catches it and lets you know what file
caused the problem.
/frameworks/base/tools/aapt/Resource.cpp
62da8461ed5317fe78ae5e3793662694e7fc99a3 14-May-2009 Dianne Hackborn <hackbod@google.com> Implement compatibility support for WRITE_SDCARD permission.

Now old applications will automatically be granted it. Also renamed it from
SDCARD_WRITE to WRITE_SDCARD to be consistent with our other permissions,
and re-arranged how we do targetSdkVersion to actually be usuable for this
kind of stuff.

Note that right now this results in basically all apps being given the
WRITE_SDCARD permission, because their targetSdkVersion is not set. I will
be dealing with that in a future change.
/frameworks/base/tools/aapt/Resource.cpp
a96cbb435d7b2197ab2b61fd98d14cbd6e0c5c3d 14-May-2009 Dianne Hackborn <hackbod@google.com> Implement compatibility support for WRITE_SDCARD permission.

Now old applications will automatically be granted it. Also renamed it from
SDCARD_WRITE to WRITE_SDCARD to be consistent with our other permissions,
and re-arranged how we do targetSdkVersion to actually be usuable for this
kind of stuff.

Note that right now this results in basically all apps being given the
WRITE_SDCARD permission, because their targetSdkVersion is not set. I will
be dealing with that in a future change.
/frameworks/base/tools/aapt/Resource.cpp
6a1fadea851db236331b3dfe1f3c1e482556057f 21-Apr-2009 Marco Nelissen <> AI 147028: Fix up aapt so it runs cleanly under the valgrind leak checker.

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