summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Collapse)AuthorAgeFilesLines
* am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and ↵John Spurlock2014-04-041-0/+5
|\ | | | | | | | | | | | | qualifier." into klp-modular-dev * commit '642421aa7f284817cc1a972a7f9c7a64696a0116': Introduce new UI_MODE_TYPE_WATCH and qualifier.
| * am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into ↵John Spurlock2014-04-041-0/+5
| |\ | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e': Introduce new UI_MODE_TYPE_WATCH and qualifier.
| | * Introduce new UI_MODE_TYPE_WATCH and qualifier.John Spurlock2014-04-041-0/+5
| | | | | | | | | | | | | | | | | | | | | Default ui mode to watch if we have FEATURE_WATCH. Bug:13395758 Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
| * | am 004ceaaa: am 55a65509: Merge "Reduce warning verbosity in aapt"Adam Lesinski2014-03-274-92/+98
| |\ \ | | | | | | | | | | | | | | | | * commit '004ceaaa4d3ddfc66ba3f3635e987c2ddc7f2d09': Reduce warning verbosity in aapt
| | * | Reduce warning verbosity in aaptAdam Lesinski2014-03-244-92/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Attributed source of problems to the correct file. - Only verify string localizations against valid locales. Bug:13140015 Change-Id: I9dabc5efa0510649caee8af0c8ebb803d6f48269
* | | | Shared library resource supportAdam Lesinski2014-03-259-19/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shared libraries can now export resources for applications to use. Exporting resources works the same way the framework exports resources, by defining the public symbols in res/values/public.xml. Building a shared library requires aapt to be invoked with the --shared-lib option. Shared libraries will be assigned a package ID of 0x00 at build-time. At runtime, all loaded shared libraries will be assigned a new package ID. Currently, shared libraries should not import other shared libraries, as those dependencies will not be loaded at runtime. At runtime, reflection is used to update the package ID of resource symbols in the shared library's R class file. The package name of the R class file is assumed to be the same as the shared library's package name declared in its manifest. This will be customizable in a future commit. See /tests/SharedLibrary/ for examples of a shared library and its client. Bug:12724178 Change-Id: I60c0cb8ab87849f8f8a1a13431562fe8603020a7
* | | | Reduce warning verbosity in aaptAdam Lesinski2014-03-204-92/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Attributed source of problems to the correct file. - Only verify string localizations against valid locales. Bug:13140015 Change-Id: I9dabc5efa0510649caee8af0c8ebb803d6f48269
* | | | resolved conflicts for merge of 92860a74 to masterNarayan Kamath2014-03-101-52/+28
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I3036ef9f1251c756092dc5ee2c4fed8146855e1e
| * | | am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-101-50/+25
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'bbf826659e8e5d0be683b2459207c495303d53b6': LP64: Make 9 patches architecture agnostic.
| | * | LP64: Make 9 patches architecture agnostic.Narayan Kamath2014-03-101-50/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Res_png_9patch struct had several pointer members whose size differed between 32 and 64 bit platforms. These members have been replaced by uint32_t offsets to serialized data. The serialized form for 9patches places a Res_png_9patch object at the beginning of serialized data, followed by int32_t arrays of xDivs, yDivs and colors. Note that these offsets are not strictly required, since they can be computed from the values of numXDivs, numYDivs & numColors, however they are called in tight loops so having them computed once is a beneficial. This change also removed the unused patch_equals function from aapt's Image.cpp. Change-Id: I3b9ac8ae5c05510d41377cae4dff1c69b40c2531
* | | | resolved conflicts for merge of a81ee86b to masterTim Kilbourn2014-03-071-9/+34
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I7be3a64261d2405eda55b43c02b47657f393c095
| * | | am b559b371: Merge "Dump leanback info in aapt dump badging." into ↵Tim Kilbourn2014-03-081-8/+32
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | klp-modular-dev * commit 'b559b37150d24411f0b5ef102ced8d5acf858a0e': Dump leanback info in aapt dump badging.
| | * | Merge "Dump leanback info in aapt dump badging." into klp-modular-devTim Kilbourn2014-03-081-8/+32
| | |\ \
| | | * | Dump leanback info in aapt dump badging.Tim Kilbourn2014-03-071-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leanback launcher activities are reported, including the banner. Change-Id: Ifa496736ad3ba4239ec95e166768af895ff4dc53
* | | | | am 71364f8c: am f5f4d930: am 74bebf6f: Exclude the host aapt and aidl from ↵Ying Wang2014-03-081-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | PDK build. * commit '71364f8c1e1bcc84375830dd5904dfe7cdfb5ed6': Exclude the host aapt and aidl from PDK build.
| * | | | am 74bebf6f: Exclude the host aapt and aidl from PDK build.Ying Wang2014-03-081-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '74bebf6faed2d34814ffc3d46664330ea568f7b2': Exclude the host aapt and aidl from PDK build.
| | * | | Exclude the host aapt and aidl from PDK build.Ying Wang2014-03-071-2/+2
| | |/ / | | | | | | | | | | | | | | | | Bug: 13028632 Change-Id: I0f774b19be77462d0fa271088a4a5a152729d13c
| * | | am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."Narayan Kamath2014-02-178-224/+522
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '28879bbfe89dc4bf2067a7183975ecffb82f68e6': Extended locales in AAPT / AssetManager.
| | * | Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-148-224/+522
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support 3 letter language codes, script codes & variants. The bulk of the changes are related to the implementation of command line filtering of locales etc. The previous code assumed that the value of each "axis" (locale, density, size etc.) could be represented by a 4 byte type. This is no longer the case. This change introduces a new class, AaptLocaleValue which holds a (normalized) locale parsed from a directory name or a filter string. This class takes responsibility for parsing locales as well as writing them to ResTable_config structures, which is their representation in the resource table. This includes minor changes at the java / JNI level for AssetManager. We now call locale.toLanguageTag() to give the native layer a well formed BCP-47 tag. I've removed some duplicated parsing code in AssetManager.cpp and replaced them with functions on ResTable_config. The native getLocales function has been changed to return well formed BCP-47 locales as well, so that the corresponding java function can use Locale.forLanguageTag to construct a Locale object out of it. Finally, this change introduces default and copy constructors for ResTable_config to prevent having to memset() the associated memory to 0 on every stack allocation. (cherry-picked from commit 91447d88f2bdf9c2bf8d1a53570efef6172fba74) Change-Id: I1b43086860661012f949fb8e5deb7df44519b854
* | | | Add --replace-version flag to aapt.Jeff Davidson2014-02-253-11/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Motivation: we'd like to programmatically specify the version name/code (i.e. to include the build number from the build server). However, this means that we cannot specify version info in the AndroidManifest.xml file, as this takes precedence. Not doing so makes IDE use more difficult, as the IDE gets version code 0 and won't install over an existing non-IDE version unless you first force a downgrade to an IDE build from the command line. This flag allows us to specify a very high version code in the AndroidManifest.xml file, making IDE builds take precedence, while still allowing us to override this info when performing command-line (official) builds. Change-Id: I5d01048698af5c26bdf19066c6cd4eca1115112a
* | | | Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-108-224/+522
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support 3 letter language codes, script codes & variants. The bulk of the changes are related to the implementation of command line filtering of locales etc. The previous code assumed that the value of each "axis" (locale, density, size etc.) could be represented by a 4 byte type. This is no longer the case. This change introduces a new class, AaptLocaleValue which holds a (normalized) locale parsed from a directory name or a filter string. This class takes responsibility for parsing locales as well as writing them to ResTable_config structures, which is their representation in the resource table. This includes minor changes at the java / JNI level for AssetManager. We now call locale.toLanguageTag() to give the native layer a well formed BCP-47 tag. I've removed some duplicated parsing code in AssetManager.cpp and replaced them with functions on ResTable_config. The native getLocales function has been changed to return well formed BCP-47 locales as well, so that the corresponding java function can use Locale.forLanguageTag to construct a Locale object out of it. Finally, this change introduces default and copy constructors for ResTable_config to prevent having to memset() the associated memory to 0 on every stack allocation. Change-Id: I899a56a9a182ee6be52b9389d1ae59266f5482e9
* | | | resolved conflicts for merge of 1b5b60d6 to masterAdam Lesinski2014-02-045-26/+38
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I2b713a55fcdf02c01afa99f175bf14248f210460
| * | | am 203356a3: Merge "Add support for multiple asset dirs (-A)" into ↵Adam Lesinski2014-02-045-25/+38
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | klp-modular-dev * commit '203356a34a82bfc759be02dfa1caa4529dce0732': Add support for multiple asset dirs (-A)
| | * Merge "Add support for multiple asset dirs (-A)" into klp-modular-devAdam Lesinski2014-02-045-25/+38
| | |\
| | | * Add support for multiple asset dirs (-A)Adam Lesinski2014-01-235-25/+38
| | | | | | | | | | | | | | | | | | | | Bug: 12608034 Change-Id: I02c5a1a73b83498d799570428cca3dd914f8ac11
| * | | Change ResourceType cookies to int32_t.Narayan Kamath2014-01-312-3/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Also change the order of parameters in ResTable constructors to avoid ambiguity. (cherry picked from commit 00b314436f4fdfada4bbf1e79ec12e9fa38aeaf1) Change-Id: I874c5d03c134dc3c331fba423b5280366296287c
| * | AssetManager cookies should be int32_t and not void*.Narayan Kamath2014-01-271-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | Cookies are really indices into vectors and arrays, so they don't need to be void*. We choose int32_t instead of size_t to allow their width to be well specified. (cherry picked from commit ebfdd0f467e39c3af8d92cade78263935340acb7) (cherry picked from commit a7fa2e592e2e579e5acdb903dba83fc074ebc215) (cherry picked from commit a9d5701b034ed2d9771b3f0943e1add00741d7cd) Change-Id: I2aed3db568b6fdc487bf99e2c5dd123206736fda
| * Merge "Don't pseudolocalize untranslatable strings."Narayan Kamath2013-12-181-5/+13
| |\
| | * Don't pseudolocalize untranslatable strings.Narayan Kamath2013-12-101-5/+13
| | | | | | | | | | | | | | | bug: https://code.google.com/p/android/issues/detail?id=63004 Change-Id: I8e47a53d887144dc867111e42313d0e113b83ea1
| * | Merge "Reimplement ZipFileRO in terms of libziparchive."Narayan Kamath2013-12-111-1/+2
| |\ \
| | * | Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2013-12-091-1/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets us share zip archive processing code with both the runtime (Art, dalvik) and critical java code (StrictJarFile). This change also moves several utility methods to ZipUtils and dedups code across several zip inflation methods. One of the side effects of this change is that several processing loops are now O(n) instead of O(n^2). bug: 10193060 Change-Id: I3c7188496837a47246c4f342e45485a70fef3169
| | * Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEADThe Android Open Source Project2013-11-2215-67/+972
| | |\ | | | | | | | | | | | | Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
| * | \ am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."Elliott Hughes2013-10-292-33/+32
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '8f592378a1ea7f31d57253dc202f42707ef4da36': Fix a variety of small publicly-reported bugs.
| | * | Fix a variety of small publicly-reported bugs.Elliott Hughes2013-10-292-33/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Possible NULL dereference in cmds/bootanimation/BootAnimation.cpp. https://code.google.com/p/android/issues/detail?id=61556 Missing fclose in core/jni/android_os_Debug.cpp. https://code.google.com/p/android/issues/detail?id=61546 Bad loop guards in core/jni/android_util_Process.cpp. https://code.google.com/p/android/issues/detail?id=61557 Assignment to wrong variable in libs/androidfw/AssetManager.cpp. https://code.google.com/p/android/issues/detail?id=61560 Missing delete[]s in libs/androidfw/ObbFile.cpp. https://code.google.com/p/android/issues/detail?id=61549 Leaks on error in tools/aapt/Images.cpp. https://code.google.com/p/android/issues/detail?id=61552 Two missing fclose calls in tools/aapt/Resource.cpp. https://code.google.com/p/android/issues/detail?id=61553 Missing fclose in tools/aidl/aidl.cpp. https://code.google.com/p/android/issues/detail?id=61554 Change-Id: I5820f3824e72d07a9acb776cf0af3e7443f5694a
| * | | am 16e8c4f7: am 7d292145: Merge "Prune unneeded density resources from APK" ↵Adam Lesinski2013-10-181-1/+38
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | into klp-dev * commit '16e8c4f7db87d743410751410c7f761350792fe2': Prune unneeded density resources from APK
| | * | Prune unneeded density resources from APKAdam Lesinski2013-10-151-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a preferred density is specified, prune all but the closest matching density when the exact density resource does not exist. If a preferred density resource does not exist and a higher density resource exists, prune all but the resource with the next highest density relative to the preferred density. If a preferred density resource does not exist and there is no higher density resource, prune all but the resource with the next lowest density relative to the preferred density. bug:11224465 Change-Id: I99b3950fe3d8116a5625968ed383442315ae8526
| * | | am ea4e0751: am c884fc9f: Merge "AAPT emits error for res with no ↵Adam Lesinski2013-10-071-4/+65
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | \'default\' product" into klp-dev * commit 'ea4e07518cd1844b1654175ef27cf9501e0dd7eb': AAPT emits error for res with no 'default' product
| | * | AAPT emits error for res with no 'default' productAdam Lesinski2013-10-041-4/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than ignoring resources that do not match the specified product, we keep track of the ignored ones and make sure that some variant of the resource that matches the product was processed. bug:10860838 Change-Id: I804cd04a053269a35b7e1c1cc743b77493337bf9
| * | | am 0c923b7c: Merge "Add badging of Payment apps" into klp-devAdam Lesinski2013-09-301-11/+142
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '0c923b7ce1f4e40b401bcd342f4ee4399f4ad9d7': Add badging of Payment apps
| | * | Add badging of Payment appsAdam Lesinski2013-09-271-11/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HCE apps that declare themselves as payment apps will receive that badge when running aapt dump badging. bug:10899864 Change-Id: I7c095214412465ad7a925285d6167e12de16b600
| * | | am 5223a5ff: Merge "Add support for dumping new badging" into klp-devAdam Lesinski2013-09-301-3/+68
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '5223a5ff24bed6d0a0ac618083a3ed050bdd98b2': Add support for dumping new badging
| | * | Add support for dumping new badgingAdam Lesinski2013-09-271-3/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | APKs with AccessibilityServices, PrintServices, and or DeviceAdmin will have those services dumped when running 'aapt dump badging'. bug:10899864 Change-Id: I9c1f1f36c397b128dca802510368573a54977459
| * | | am 86974463: Merge "Added support for supports-input manifest element" into ↵Michael Wright2013-09-051-50/+87
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | klp-dev * commit '86974463e9e28108e14fa255efd3c429358c0605': Added support for supports-input manifest element
| | * | Added support for supports-input manifest elementMichael Wright2013-09-051-50/+87
| | | | | | | | | | | | | | | | Change-Id: Ifa7c87908081585c1940b5a47fdf5138a287d9ea
| * | | am 49ee555f: Merge "Transition API changes from API council recommendations" ↵Chet Haase2013-09-041-26/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '49ee555f239c79871b661e5ff135061f26665e1c': Transition API changes from API council recommendations
| | * | Transition API changes from API council recommendationsChet Haase2013-09-041-26/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #10460684 KLP API Review: android.view.transition and android.animation Issue #10570740 Transitions: inflate transition targets from xml Change-Id: I7a3f6d3aece2fcafc5efd555d033f79e86635c98
| * | | am adae1e91: am 1b8c33c6: Merge "Forward compatibility fixes"Victoria Lease2013-08-271-11/+16
| |\ \ \ | | |/ / | |/| / | | |/ | | | * commit 'adae1e91de4b2be7a67a33e8f3c3161f5cec15e1': Forward compatibility fixes
| | * Forward compatibility fixesJohn Reck2013-08-261-11/+16
| | | | | | | | | | | | Change-Id: Iaf387a10c387e5e157bb16d120a1e033b3d1a6e8
* | | Change ResourceType cookies to int32_t.Narayan Kamath2014-01-282-2/+2
| | | | | | | | | | | | | | | | | | | | | Also change the order of parameters in ResTable constructors to avoid ambiguity. Change-Id: If7bfa1f640dddca39b9f26a3ce84081fa7b6e6e3
* | | AssetManager cookies are now int32_t, not void*.Narayan Kamath2014-01-271-1/+1
| | | | | | | | | | | | Change-Id: Id383e31922ca81c52dad52d422c5c1ab1a1365ce
generated by cgit v1.1 at 2025-03-29 14:52:48 +0000