summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Collapse)AuthorAgeFilesLines
* am 106f83ee: am 4cead39a: am 1be312df: Merge "Re-enable -Wall and -Werror ↵Colin Cross2015-04-094-5/+2
|\ | | | | | | | | | | | | that were lost in a merge" * commit '106f83ee9cc145a6421d21067c44b513cc148e80': Re-enable -Wall and -Werror that were lost in a merge
| * Merge "Re-enable -Wall and -Werror that were lost in a merge"Colin Cross2015-04-094-5/+2
| |\
| | * Re-enable -Wall and -Werror that were lost in a mergeColin Cross2015-04-084-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | -Wall and -Werror were lost during a merge when they were added to aaptCFLAGS instead of aaptCFlags. Fix the typo, and the warnings that crept in while it was disabled. Change-Id: Ib944b8d6149278e4f3861c1acac277bcd95cc7c2
* | | am 66d94512: am dbb5f5d6: am efcbaec1: Merge "Only Windows doesn\'t have %zd."Elliott Hughes2015-04-034-4/+4
|\ \ \ | |/ / | | | | | | | | | * commit '66d9451273c4a3775b6b63a0e4b7027bd2eae65d': Only Windows doesn't have %zd.
| * | Only Windows doesn't have %zd.Elliott Hughes2015-04-034-4/+4
| |/ | | | | | | Change-Id: I0e4b0fdc61641c5ecb724fd096bd2315dcf8ed4a
* | Merge "Output modified bcp47 tag in ResTable_config::toString()"Adam Lesinski2015-03-203-30/+1
|\ \
| * | Output modified bcp47 tag in ResTable_config::toString()Adam Lesinski2015-03-163-30/+1
| | | | | | | | | | | | | | | | | | | | | We expect to be able to parse the output of ResTable_config::toString(), so it should use modified bcp47 (b+en+Latn+US). Change-Id: I597a1779a1fa5cff171c473e6a0368d93b9c7722
* | | am 0634fba5: am 89da4ca6: Merge "Remove unused printapk.cpp."Elliott Hughes2015-03-191-127/+0
|\ \ \ | | |/ | |/| | | | | | | * commit '0634fba5915073e5b46e24f0ba0d5bbc44c922a5': Remove unused printapk.cpp.
| * | Remove unused printapk.cpp.Elliott Hughes2015-03-191-127/+0
| | | | | | | | | | | | | | | | | | | | | This is one of the few remaining users of libzipfile, but doesn't get built. Not worth porting to libziparchive. Change-Id: Ica466b22e3a7ebaf123727c0d703af39cc89cf9c
* | | Handle malformed manifests in printXMLBlockVishwath Mohan2015-03-121-14/+22
| |/ |/| | | | | | | | | | | | | | | | | Specially crafted manifest files can cause a segfault in printXMLBlock() using improper tag nesting (without evaluating to ResXMLTree::BAD_DOCUMENT). This fix checks and breaks when this condition is detected. Bug: 15549617 Change-Id: I27997fda86d228e993217a0c09993bff404cf317
* | am 7a79c4ca: am f8d6a4ba: resolved conflicts for merge of 701f9c2f to ↵Dan Albert2015-03-053-26/+19
|\ \ | |/ | | | | | | | | | | stage-aosp-master * commit '7a79c4cac3b0c722832e868346db2375b6d6c379': Stop using namespace std.
| * resolved conflicts for merge of 701f9c2f to stage-aosp-masterDan Albert2015-03-053-26/+19
| |\ | | | | | | | | | Change-Id: I42e0411c0acef4b15137491ecaaed95d9b1cd0c1
| | * Stop using namespace std.Dan Albert2015-03-043-26/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pattern of #include and using namespace std here fails to build with GCC. At first glance it's a GCC bug rather than libc++ doing something wrong. Regardless, it can be worked around by just specifying std:: where appropriate. Bug: 19606303 Change-Id: I5652682eae7ca7559cf2a9307909859013440781
* | | Merge "Parse res-car as resources for UI_MODE_TYPE_CAR.."Narayan Kamath2015-02-112-1/+8
|\ \ \ | |/ / |/| |
| * | Parse res-car as resources for UI_MODE_TYPE_CAR..Narayan Kamath2015-02-102-1/+8
| | | | | | | | | | | | | | | | | | | | | .. and not a 3 letter language code. bug: 19291216 Change-Id: I01bf76d89880693dcdb4384d5c239902fa3defa8
* | | am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into ↵Chris Warrington2015-02-101-15/+10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 4499888 * commit '449988872be61f273c91db13069d5b7172429032': Fix AAPT daemon mode with paths containg spaces.
| * | Fix AAPT daemon mode with paths containg spaces.Chris Warrington2015-02-091-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | Use new line as a delimiter rather than space. Fixes: https://code.google.com/p/android/issues/detail?id=135757 Gradle CL: https://android-review.googlesource.com/130423 Change-Id: I7c73e680b0417b0e7cff9e0110822675c53ae20f
* | | Merge "AAPT: Use the right enum when checking for density configurations" ↵Adam Lesinski2015-01-231-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: b443610 automerge: 83f58a2 * commit '83f58a2f7afac98199536b3090fe6f767ffb3a0d': AAPT: Use the right enum when checking for density configurations
| * | AAPT: Use the right enum when checking for density configurationsAdam Lesinski2015-01-221-1/+1
| | | | | | | | | | | | | | | Bug:19116675 Change-Id: I2322d8d6bdf890005c80014273e5d07df735ed50
* | | am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute ↵Adam Lesinski2015-01-143-48/+127
|\ \ \ | |/ / | | | | | | | | | | | | | | | usage" into lmp-mr1-dev * commit 'e488ce8668538b45c586eba21f5bca288d749686': AAPT: Handle all old unversioned attribute usage
| * | AAPT: Handle all old unversioned attribute usageAdam Lesinski2015-01-143-48/+127
| | | | | | | | | | | | | | | | | | | | | | | | All references to attributes defined in pre-LOLLIPOP_MR1 SDK are moved to version qualified resource entries. Bug:18221682 Change-Id: Ifd739530ebcf99e6bc7ddb3f10bc5e05f0726e62
* | | am c04a21a0: Merge "Fixup aapt usage message" automerge: 64044d0Adam Lesinski2015-01-081-1/+1
|\ \ \ | | |/ | |/| | | | | | | * commit 'c04a21a0ef6cd97a45307e4c1de9088e57719ca2': Fixup aapt usage message
| * | Fixup aapt usage messageJohan Redestig2015-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The --preferred-configurations option was renamed to --preferred-density in fab5087 but only part of the usage message was changed. Change-Id: I89d270990023beca19605901d956d29d0b0b848b
| * | Add appropriate casts for char16_t.Dan Albert2014-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | C++11 defines a real char16_t, which is not implicitly convertible to uint16_t (and by extension jchar). Add casts as needed. Bug: 18300613 Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
* | | am 503a4494: am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" ↵Adam Lesinski2014-12-162-0/+16
|\ \ \ | | |/ | |/| | | | | | | | | | | | | into lmp-mr1-dev * commit '503a4494d64d30f9b904b24a56fff986810da610': AAPT: Copy android:revisionCode to Splits
| * | Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-devAdam Lesinski2014-12-162-0/+16
| |\ \
| | * | AAPT: Copy android:revisionCode to SplitsAdam Lesinski2014-12-162-0/+16
| | | | | | | | | | | | | | | | | | | | Bug:18706179 Change-Id: I669b56e0b67dd1bfda7749ef433b55af16851154
* | | | am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would ↵Adam Lesinski2014-12-161-25/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | be removed for pre-21 devices" into lmp-mr1-dev automerge: 465d123 * commit '465d123464eadf180b618164b2ed23702bca3d86': AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices
| * | | Merge "AAPT: attributes showing up after v21 attributes would be removed for ↵Adam Lesinski2014-12-151-25/+17
| |\ \ \ | | | | | | | | | | | | | | | pre-21 devices" into lmp-mr1-dev
| | * | | AAPT: attributes showing up after v21 attributes would be removed for pre-21 ↵Adam Lesinski2014-12-101-25/+17
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devices There was an inconsistency in the indexing when removing attributes in layouts. Now we account for that shift that happens when you delete an attribute. Bug:18707321 Change-Id: I656eee3fb614168fa8ceeff379e8594708961dad
* | | | am c765655a: am fbba9b57: Merge "AAPT: Dump status of required flag for ↵Adam Lesinski2014-12-091-5/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | uses-feature" into lmp-mr1-dev * commit 'c765655ae1ae35f9d5f0958295f0b71270132ca7': AAPT: Dump status of required flag for uses-feature
| * | | AAPT: Dump status of required flag for uses-featureAdam Lesinski2014-12-081-5/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Outside of a feature-group, the legacy uses-feature tag has a boolean required flag that should be emitted in dump badging. Bug:17790999 Change-Id: I43023af00e9c9ed4bc35795c3a983fc719bf9b7a
* | | Merge commit '0953ab27' into manualmergeAdam Lesinski2014-12-052-22/+164
|\ \ \ | |/ / | | | | | | Change-Id: I36dea45f7571096136ea7bda5e2680bd85a0df32
| * | Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-devAdam Lesinski2014-12-042-22/+161
| |\ \
| | * | AAPT: Move private attrs to new type for frameworkAdam Lesinski2014-12-032-22/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private attributes are typically placed after public attributes in the resource table. Each time a new version of the Android framework is released, new public attributes take the place of the private attributes, and the private attributes are shifted after the new public ones. This means that any apps built against the newer SDK may inadvertently be using private attributes on older devices. This change moves all private attributes to a completely different type ID, so there will never be collisions across versions. These private attributes are automatically moved to a synthesized type only for the system resources. Bug:18263655 Change-Id: I7a850512953fadcc9f3524d509cea30249782db8
* | | | am 72a6aeac: am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to ↵Adam Lesinski2014-12-031-6/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Proguard Keep set" into lmp-mr1-dev * commit '72a6aeaca0712d9b72b9f773e2b72bb45ddd3cb8': AAPT: Add pathMotion custom classes to Proguard Keep set
| * | | AAPT: Add pathMotion custom classes to Proguard Keep setAdam Lesinski2014-12-021-6/+9
| | | | | | | | | | | | | | | | | | | | Bug:18590044 Change-Id: Ia5dbf55317d2cc89826316e8d10f031b5d340e57
* | | | am f17611a2: am 130e30fe: Merge "AAPT: Add custom transition classes to ↵Adam Lesinski2014-12-031-0/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Proguard keep set" into lmp-mr1-dev * commit 'f17611a29e3b0d0c7a5d28a1ce92682a2c097de6': AAPT: Add custom transition classes to Proguard keep set
| * | | AAPT: Add custom transition classes to Proguard keep setAdam Lesinski2014-12-021-0/+9
| |/ / | | | | | | | | | | | | Bug:18590044 Change-Id: Ib24831e669a09f0e6f32434081c0e2499702399c
* | | am 537888be: Merge "kill HAVE_LOCALTIME_R"Yabin Cui2014-11-131-2/+2
|\ \ \ | | |/ | |/| | | | | | | * commit '537888be7d5cfa6bfa9ddd459a622ea208339735': kill HAVE_LOCALTIME_R
| * | kill HAVE_LOCALTIME_RYabin Cui2014-11-131-2/+2
| | | | | | | | | | | | | | | Bug: 18361583 Change-Id: Ia79e2b641fd6c61ae5d2b8f2db5456bd3d36a25b
* | | resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aospDan Albert2014-11-121-1/+0
|\ \ \ | |/ / | | | | | | Change-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9
| * | Move frameworks/base over to libc++.Dan Albert2014-11-121-1/+0
| | | | | | | | | | | | | | | Bug: 15193147 Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
* | | am da772234: Merge "AAPT: Ignore densities specified in -c flag" into ↵Adam Lesinski2014-11-111-0/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 1e2e05b * commit '1e2e05bf8cb1445f9e431ca54837bb01f762d9e6': AAPT: Ignore densities specified in -c flag
| * | AAPT: Ignore densities specified in -c flagAdam Lesinski2014-11-101-0/+7
| | | | | | | | | | | | | | | | | | | | | The --preferred-density flag knows how to handle missing resources of specific densities. Using -c with a density leads to missing resources. Change-Id: I2251d842f48c08ed083663bb7ed608e14c4983c8
* | | am 8aa93764: Merge "Fixing NULL pointer access causing segmentation fault in ↵Adam Lesinski2014-11-111-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | aapt" * commit '8aa93764ea025b1c20f96b366ae6efb17e4f2d67': Fixing NULL pointer access causing segmentation fault in aapt
| * | Fixing NULL pointer access causing segmentation fault in aaptJörgen Ekström2014-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cases where resource packages are generated which does not have public resources for all resource types - NULL pointers sneaks into the mOrderedConfigs vector causing the aapt tool to crash. The solution in this fix simply ignores the NULL elements when later processing the sorted vector. The NULL elements are inserted during applyPublicEntryOrder function call Change-Id: I8b7135932e2d235018da2e2f7e09f0d22f1b2f59
| * | am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN."Dan Albert2014-10-201-1/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '9295a1354eb8220be9a0a40985253c6cdfac35c3': Fix an overflow found by ASAN.
| * \ \ am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" ↵Adam Lesinski2014-10-201-1/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '3f8c7dec6b3fd4ac7fc99fe4e41cd0fa1b97bcad': AAPT: Fix path for final generated resources on Windows
| * \ \ \ am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly ↵Adam Lesinski2014-10-171-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | derived on Windows" into lmp-dev * commit '3cd840f4b5a2988700a6b366fa32f4565c319900': AAPT: Fix an issue where a resource name was incorrectly derived on Windows
generated by cgit v1.1 at 2025-08-06 08:42:40 +0000