summaryrefslogtreecommitdiffstats
path: root/libs/androidfw/AssetManager.cpp
Commit message (Expand)AuthorAgeFilesLines
* Shared library resource supportAdam Lesinski2014-03-251-12/+33
* resolved conflicts for merge of 1cbea39f to masterNick Kralevich2014-02-121-165/+149
|\
| * resolved conflicts for merge of dd3d95f1 to klp-volantis-devNick Kralevich2014-02-121-165/+149
| |\
| | * Runtime resource overlay, iteration 2Mårten Kongstad2014-02-031-165/+149
| * | Fix build.Dianne Hackborn2014-02-111-2/+2
| |/
* | Fix build.Dianne Hackborn2014-02-111-2/+2
* | am be49403a: am 0cd115e1: am 578087e3: Merge "New command line tool \'idmap\'"Dianne Hackborn2014-02-111-0/+25
|\ \ | |/
| * New command line tool 'idmap'Mårten Kongstad2014-02-031-0/+25
| * Change ResourceType cookies to int32_t.Narayan Kamath2014-01-311-3/+3
| * AssetManager cookies should be int32_t and not void*.Narayan Kamath2014-01-271-13/+12
| * Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2013-12-091-21/+23
| * Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEADThe Android Open Source Project2013-11-221-1/+2
| |\
| * | Fix a variety of small publicly-reported bugs.Elliott Hughes2013-10-291-11/+11
* | | Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-101-24/+6
* | | Change ResourceType cookies to int32_t.Narayan Kamath2014-01-281-3/+3
* | | AssetManager cookies should be int32_t and not void*.Narayan Kamath2014-01-271-13/+12
* | | Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2014-01-271-21/+23
* | | Re-apply androidfw fixes lost by the directory rearrangement.Elliott Hughes2014-01-271-1/+1
* | | Revert "move libandroidfw to frameworks/native"Adam Lesinski2014-01-271-0/+2034
* | | move libandroidfw to frameworks/nativeMike Lockwood2013-10-031-2034/+0
| |/ |/|
* | libutils clean-upMathias Agopian2013-05-071-1/+2
|/
* Maybe fix issue #8620910: Win_sdk build failed and unable to create...Dianne Hackborn2013-04-151-0/+2
* Add new resources trace, also trace apk dex loading.Dianne Hackborn2013-04-121-0/+12
* libutils cleanupMathias Agopian2012-08-051-0/+18
* frameworks/base: move Zip* from libandroidfw to libutilsColin Cross2012-03-221-1/+1
* frameworks/base refactoringMathias Agopian2012-02-201-0/+2001