summaryrefslogtreecommitdiffstats
path: root/libs/androidfw
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Use more intention-revealing tests for S_ISLNK and S_ISSOCK.Elliott Hughes2015-01-121-1/+3
| | | | | | | | | | | | | | | | Change-Id: Ia7f13eb7d5a36cf2b4c0a253b2b4d7f7af396951
* | | | am 347040cf: am 740acf21: am c7801877: Merge "Fix issue where non-resource ↵Adam Lesinski2014-12-111-0/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev * commit '347040cf84401601b0d5cbb1d76e4648d1c8a461': Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
| * | | am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes ↵Adam Lesinski2014-12-111-0/+17
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | would cause obtainStyleAttributes to fail" into lmp-mr1-dev * commit '740acf213c56c406132294790fa2fadd0380cfa7': Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
| | * | Fix issue where non-resource attributes would cause obtainStyleAttributes to ↵Adam Lesinski2014-12-101-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fail A sentinal value of 0x00000000 was used to mark the first time an AttributeFinder was used. If the resource ID of an attribute was also 0x00000000 (which occurs with non-resource attributes, like 'style'), then it would be mistaken as the sentinel start value. Bug:18421787 Change-Id: I4be353e0f8c940cb6f262d155129f048dcc444ae
* | | | am e97908d3: Merge commit \'0953ab27\' into manualmergeAdam Lesinski2014-12-051-48/+57
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e97908d32ee8ea80138d085260a0eac93841c722': AAPT: Move private attrs to new type for framework
| * | | Merge commit '0953ab27' into manualmergeAdam Lesinski2014-12-051-48/+57
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I36dea45f7571096136ea7bda5e2680bd85a0df32
| | * | AAPT: Move private attrs to new type for frameworkAdam Lesinski2014-12-031-46/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 8e5362f2: am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system ↵Adam Lesinski2014-12-041-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | overlays" * commit '8e5362f20e2bc41b1dcf130a613b7e0b3cd1db58': RRO: prevent duplicate system overlays
| * | | am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays"Adam Lesinski2014-12-041-0/+6
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '503071ae41374a66f61e53e05a91243473db83b9': RRO: prevent duplicate system overlays
| | * | Merge "RRO: prevent duplicate system overlays"Adam Lesinski2014-12-031-0/+6
| | |\ \
| | | * | RRO: prevent duplicate system overlaysMårten Kongstad2014-11-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | System overlays, ie overlays with targetPackage="android", were loaded twice, which caused all sorts of issues. Ensure they are only loaded once, which will be during Zygote initialization. Bug: 17765434 Change-Id: Ia5064045c77f713c58fb78adc3942f6af1abdc93
* | | | | am 9438ad15: am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227cAdam Lesinski2014-12-032-5/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * commit '9438ad1599716176fb6c593e77a2e93b265bbcb5': RRO idmap: pad with 0xffffffff, not 0x00000000 RRO: reintroduce lost ResTable insert of assets
| * | | | am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227cAdam Lesinski2014-12-022-5/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | * commit 'e580d6617f67a1db5eff7ffe5450684cfc7e1a2b': RRO idmap: pad with 0xffffffff, not 0x00000000 RRO: reintroduce lost ResTable insert of assets
| | * | | Merge changes If2c7e09f,Ie21f227cAdam Lesinski2014-12-022-5/+9
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | * changes: RRO idmap: pad with 0xffffffff, not 0x00000000 RRO: reintroduce lost ResTable insert of assets
| | | * | RRO idmap: pad with 0xffffffff, not 0x00000000Mårten Kongstad2014-11-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the new idmap format (version 0x1), 0x00000000 no longer represents a non-existing entry: 0xffffffff should be used instead. Bug: 17765434 Change-Id: If2c7e09feba2224eeafe88fd9230e6392d81b9a7
| | | * | RRO: reintroduce lost ResTable insert of assetsMårten Kongstad2014-11-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the recent introduction of AssetManager::appendPathToResTable, overlay packages were not properly added to the AssetManager, and once added, were not properly inserted into the ResTable. Bug: 17765434 Change-Id: Ie21f227c654c98730f74a687d0e16ee2b80e747e
* | | | | am ee46d162: am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN."Elliott Hughes2014-11-221-8/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ee46d1621f817d626e8dd42e9ffe7051f4a829eb': We HAVE_LITTLE_ENDIAN.
| * | | | am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN."Elliott Hughes2014-11-221-8/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '08e2fd7238c50b5d06af41bc944ee08acb023d51': We HAVE_LITTLE_ENDIAN.
| | * | | We HAVE_LITTLE_ENDIAN.Elliott Hughes2014-11-211-8/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I5b5d0ef3f91fe84d629d2ddac436bd22019edfd4
* | | | | am 11bdd5b1: Merge commit \'06d8b7b8\' into manualmergeAdam Lesinski2014-11-173-3/+119
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '11bdd5b10b5f921b657283fa94463263171218d5': Implement back-tracking when searching for attributes in XML or resource bag
| * | | | Merge commit '06d8b7b8' into manualmergeAdam Lesinski2014-11-173-3/+119
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: core/jni/android_util_AssetManager.cpp Change-Id: I77b72d0d3ec8184ccd97419e4c76b7d55b1a52ca
| | * | | Merge "Implement back-tracking when searching for attributes in XML or ↵Adam Lesinski2014-11-173-3/+119
| | |\ \ \ | | | | | | | | | | | | | | | | | | resource bag" into lmp-mr1-dev
| | | * | | Implement back-tracking when searching for attributes in XML or resource bagAdam Lesinski2014-11-043-3/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shared libraries have their package ID assigned at run-time, so some of the guarantees we used to have about sort order of attributes in bags or XML elements no longer hold. This CL adds back-tracking and can jump to the nearest attribute with the same package ID and continue searching. This means that attributes with the same package ID must be sorted by increasing resource ID, as was the case before. Attributes with the same package ID must be grouped together, but the groups can be in any order. Ex: 0x02010001, 0x02010002, 0x01010000, 0x01010010, 0x7f010032 Bug:17666947 Change-Id: I9c198bbb6ca788849aac85b6323606ea5d9550d6
* | | | | | am 984d81c3: am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant."Elliott Hughes2014-11-101-15/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '984d81c3937d46240fb9645ffa37c5166284a983': bionic's struct stat is now POSIX-compliant.
| * | | | | am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant."Elliott Hughes2014-11-101-15/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit 'c34e63598e318c9aa0debde09730a26c64bc1203': bionic's struct stat is now POSIX-compliant.
| | * | | | bionic's struct stat is now POSIX-compliant.Elliott Hughes2014-11-101-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One less hack needed... Bug: 18298106 Change-Id: I1e9e5ebf329bd6cbaf3445201f182793ee4871ce
* | | | | | am 5bbb52e8: am 189bf056: Merge "Frameworks/base: Fix more warnings"Andreas Gampe2014-11-093-11/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '5bbb52e8a4242efeea27921ac3e38cf6f9c56162': Frameworks/base: Fix more warnings
| * | | | | am 189bf056: Merge "Frameworks/base: Fix more warnings"Andreas Gampe2014-11-093-11/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '189bf05616b854f0319c7329a96e63ad374fd6c0': Frameworks/base: Fix more warnings
| | * | | | Frameworks/base: Fix more warningsAndreas Gampe2014-11-073-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exposed by switching the target to Clang, and GCC 4.9 used by MIPS. Change-Id: Icb79285ab2306c39c2d381e53ea2e643ee2d2947
* | | | | | am 83892ecb: Merge "resolved conflicts for merge of 487ae9b8 to ↵Andreas Gampe2014-11-0710-247/+410
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp * commit '83892ecb5c38f6e8a216e1596cd6a16bf7bd6a55': Frameworks/base: Wall Werror in libs/androidfw
| * | | | | resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-0710-247/+410
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | Change-Id: I395f184d885a7ef30aa113ab01fcaacc94243008
| | * | | | Frameworks/base: Wall Werror in libs/androidfwAndreas Gampe2014-11-0710-248/+410
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Turn on -Wall -Werror in libs/androidfw. Fix warnings. Refactor some code. Change-Id: I66fe54ace433c15dee5de328b149ca142f74b2dd
| | * | | Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-masterBill Yi2014-10-2252-1223/+4136
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I7063b7b52e9c09a57eb6bf3b4ffa3716d58ebf43
| | | * \ \ am aeef612f: Merge "Search all packages for a given type string when looking ↵Adam Lesinski2014-10-092-43/+60
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | up resources by name" into lmp-dev * commit 'aeef612f200b6b5cee214230271e1c3d718151ee': Search all packages for a given type string when looking up resources by name
| | | * \ \ \ am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a ↵Adam Powell2014-10-011-5/+1
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shared lib"" into lmp-dev * commit 'c6a06d437cf2ee7926a01b2f8ee685555bfb3d81': Revert "Fix issue with using locally defined attrs in a shared lib"
| | | * \ \ \ \ am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared ↵Adam Lesinski2014-10-011-1/+5
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lib" into lmp-dev * commit 'cd8e73817d14798f9d2031ffd301a03a096b7907': Fix issue with using locally defined attrs in a shared lib
| | | * \ \ \ \ \ resolved conflicts for merge of 8791ebf0 to lmp-dev-plus-aospDan Albert2014-09-191-1/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d0f81003f84d03a7a67420dd496fde18dd654d4
| | | * \ \ \ \ \ \ am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT ↵Adam Lesinski2014-09-192-1/+41
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | public attrs" into lmp-dev * commit '8bdb265f0a73bc6f2114ca70f141c214a23696c7': Fix backwards compat problem with AAPT public attrs
* | | | \ \ \ \ \ \ \ am 8491c4ea: Merge "Merge commit \'fb96e54\' into manualmerge" into ↵Adam Lesinski2014-11-051-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev-plus-aosp * commit '8491c4ead7dba5cfd406cf99a511fc1dce07cc4d': Add error checking to aapt for split generation
| * | | | | | | | | | Merge commit 'fb96e54' into manualmergeAdam Lesinski2014-11-051-0/+4
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/aapt/Resource.cpp Change-Id: I4147c3550e9426f3429146eaeb16f10ba76b5b15
| | * | | | | | | | | Add error checking to aapt for split generationAdam Lesinski2014-11-031-0/+4
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ica627db6a671f6a6c35f98bfd9c03598ffe103ce
* | | | | | | | | | am 3fd34002: Merge commit \'78be0498\' into manualmergeAdam Lesinski2014-11-044-44/+32
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3fd340028fc24198edb23ddf5eb5a0a100bab745': Fix issues that will be present in C++11
| * | | | | | | | | Merge commit '78be0498' into manualmergeAdam Lesinski2014-11-034-44/+32
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libs/androidfw/ResourceTypes.cpp tools/aapt/Android.mk tools/aapt/StringPool.cpp tools/aapt/StringPool.h Change-Id: I9d69efdfb892032895ace12159d193304f02dc6c
| | * | | | | | | | Merge "Fix issues that will be present in C++11" into lmp-mr1-devAdam Lesinski2014-11-034-56/+44
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix issues that will be present in C++11Adam Lesinski2014-11-034-56/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - char16_t is a distinct type, so stay consistent with it throughout the code base. - char16_t is defined as minimum size of 16 bits. Since we mmap and cast data structures onto raw memory, we need a precise definition (uint16_t), so we cast between that (and static_assert that they are the same size). Change-Id: I869c32637543bbcfb39d2643e7d9df10d33acd3c
* | | | | | | | | | | am 9a77c8a2: am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and ↵Alan Viverette2014-10-311-1/+15
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | explicit null values in resources" into lmp-mr1-dev * commit '9a77c8a279bfe3293295ed77c775ea29b88b2916': Distinguish unspecified and explicit null values in resources
| * | | | | | | | | | am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null ↵Alan Viverette2014-10-311-1/+15
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values in resources" into lmp-mr1-dev * commit '3c5cc234eeef4a08ad7b00b4e869a1e47cf14ab3': Distinguish unspecified and explicit null values in resources
| | * | | | | | | | | Distinguish unspecified and explicit null values in resourcesAlan Viverette2014-10-291-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 17919345 Change-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea
* | | | | | | | | | | am d75d3eb5: am 31b76b66: Merge "libandroidfw: Do not build device library ↵Adam Lesinski2014-10-281-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when building SDK" into lmp-mr1-dev automerge: 06caf1b * commit 'd75d3eb5e423fbcc069dd3c40a4a5eeeaf8bcdab': libandroidfw: Do not build device library when building SDK
| * | | | | | | | | | am 31b76b66: Merge "libandroidfw: Do not build device library when building ↵Adam Lesinski2014-10-281-0/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK" into lmp-mr1-dev automerge: 06caf1b * commit '06caf1b1112a6a3e364a46d02b883451e9180a07': libandroidfw: Do not build device library when building SDK
generated by cgit v1.1 at 2025-08-15 21:51:40 +0000