summaryrefslogtreecommitdiffstats
path: root/libs/androidfw
Commit message (Expand)AuthorAgeFilesLines
* Fix UB in ResourceTable::stringToInt.Dan Albert2015-04-083-34/+151
* am 72dc62ea: Merge "Track removal of refcounts from FileMap."Narayan Kamath2015-02-242-4/+4
|\
| * Track removal of refcounts from FileMap.Narayan Kamath2015-02-232-4/+4
* | am aee7225e: Merge "Process base APK" into lmp-mr1-devAdam Lesinski2015-01-201-1/+7
|\ \
| * | Process base APKAdam Lesinski2015-01-161-1/+7
* | | Restore write_delete_fileBrian Carlstrom2015-01-141-0/+7
* | | am 9568307c: am 43a4a8c7: Fix redundant file backupsChristopher Tate2015-01-151-36/+41
|\ \ \ | |/ /
| * | Fix redundant file backupsChristopher Tate2015-01-141-38/+41
* | | am d6c475dc: am 595ae39f: Merge "Use more intention-revealing tests for S_ISL...Elliott Hughes2015-01-131-1/+3
|\ \ \ | | |/ | |/|
| * | Use more intention-revealing tests for S_ISLNK and S_ISSOCK.Elliott Hughes2015-01-121-1/+3
* | | am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes woul...Adam Lesinski2014-12-111-0/+17
|\ \ \ | | |/ | |/|
| * | Fix issue where non-resource attributes would cause obtainStyleAttributes to ...Adam Lesinski2014-12-101-0/+17
* | | Merge commit '0953ab27' into manualmergeAdam Lesinski2014-12-051-48/+57
|\ \ \ | |/ /
| * | AAPT: Move private attrs to new type for frameworkAdam Lesinski2014-12-031-46/+57
* | | am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays"Adam Lesinski2014-12-041-0/+6
|\ \ \ | | |/ | |/|
| * | Merge "RRO: prevent duplicate system overlays"Adam Lesinski2014-12-031-0/+6
| |\ \
| | * | RRO: prevent duplicate system overlaysMårten Kongstad2014-11-071-0/+6
* | | | am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227cAdam Lesinski2014-12-022-5/+9
|\ \ \ \ | |/ / /
| * | | Merge changes If2c7e09f,Ie21f227cAdam Lesinski2014-12-022-5/+9
| |\ \ \ | | |/ /
| | * | RRO idmap: pad with 0xffffffff, not 0x00000000Mårten Kongstad2014-11-071-5/+5
| | * | RRO: reintroduce lost ResTable insert of assetsMårten Kongstad2014-11-071-0/+4
* | | | am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN."Elliott Hughes2014-11-221-8/+0
|\ \ \ \ | |/ / /
| * | | We HAVE_LITTLE_ENDIAN.Elliott Hughes2014-11-211-8/+0
* | | | Merge commit '06d8b7b8' into manualmergeAdam Lesinski2014-11-173-3/+119
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "Implement back-tracking when searching for attributes in XML or resour...Adam Lesinski2014-11-173-3/+119
| |\ \ \
| | * | | Implement back-tracking when searching for attributes in XML or resource bagAdam Lesinski2014-11-043-3/+119
* | | | | am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant."Elliott Hughes2014-11-101-15/+4
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | bionic's struct stat is now POSIX-compliant.Elliott Hughes2014-11-101-15/+4
* | | | | am 189bf056: Merge "Frameworks/base: Fix more warnings"Andreas Gampe2014-11-093-11/+5
|\ \ \ \ \ | |/ / / /
| * | | | Frameworks/base: Fix more warningsAndreas Gampe2014-11-073-11/+5
* | | | | resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-0710-247/+410
|\ \ \ \ \ | |/ / / /
| * | | | Frameworks/base: Wall Werror in libs/androidfwAndreas Gampe2014-11-0710-248/+410
| | |_|/ | |/| |
| * | | Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-masterBill Yi2014-10-2252-1223/+4136
| |\ \ \
| | * \ \ am aeef612f: Merge "Search all packages for a given type string when looking ...Adam Lesinski2014-10-092-43/+60
| | |\ \ \
| | * \ \ \ am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a s...Adam Powell2014-10-011-5/+1
| | |\ \ \ \
| | * \ \ \ \ am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared li...Adam Lesinski2014-10-011-1/+5
| | |\ \ \ \ \
| | * \ \ \ \ \ resolved conflicts for merge of 8791ebf0 to lmp-dev-plus-aospDan Albert2014-09-191-1/+0
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT publi...Adam Lesinski2014-09-192-1/+41
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Merge commit 'fb96e54' into manualmergeAdam Lesinski2014-11-051-0/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Add error checking to aapt for split generationAdam Lesinski2014-11-031-0/+4
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge commit '78be0498' into manualmergeAdam Lesinski2014-11-034-44/+32
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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
* | | | | | | | | | am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null va...Alan Viverette2014-10-311-1/+15
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Distinguish unspecified and explicit null values in resourcesAlan Viverette2014-10-291-1/+15
* | | | | | | | | | am 31b76b66: Merge "libandroidfw: Do not build device library when building S...Adam Lesinski2014-10-281-0/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | libandroidfw: Do not build device library when building SDKAdam Lesinski2014-10-241-0/+3
| |/ / / / / / / /
* | | | | | | | | am 879f237a: Merge "Added some more Split density tests" into lmp-mr1-devAdam Lesinski2014-10-2436-157/+803
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Added some more Split density testsAdam Lesinski2014-10-2336-157/+803
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | am 3d23d557: am 7f2bc6c7: Merge "More LOCAL_ADDITIONAL_DEPENDENCIES."Dan Albert2014-10-211-0/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
generated by cgit v1.1 at 2025-02-15 16:00:21 +0000