summaryrefslogtreecommitdiffstats
path: root/libs/androidfw/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-071-5/+8
|\ | | | | | | Change-Id: I395f184d885a7ef30aa113ab01fcaacc94243008
| * Frameworks/base: Wall Werror in libs/androidfwAndreas Gampe2014-11-071-6/+10
| | | | | | | | | | | | | | 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-221-0/+1
| |\ | | | | | | | | | Change-Id: I7063b7b52e9c09a57eb6bf3b4ffa3716d58ebf43
* | \ Merge commit '78be0498' into manualmergeAdam Lesinski2014-11-031-24/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libs/androidfw/ResourceTypes.cpp tools/aapt/Android.mk tools/aapt/StringPool.cpp tools/aapt/StringPool.h Change-Id: I9d69efdfb892032895ace12159d193304f02dc6c
| * | | Fix issues that will be present in C++11Adam Lesinski2014-11-031-24/+10
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 3d23d557: am 7f2bc6c7: Merge "More LOCAL_ADDITIONAL_DEPENDENCIES."Dan Albert2014-10-211-0/+2
|\ \ \ | |/ / |/| / | |/ | | * commit '3d23d557ff00010c041ec3fc655472db3d12509e': More LOCAL_ADDITIONAL_DEPENDENCIES.
| * More LOCAL_ADDITIONAL_DEPENDENCIES.Dan Albert2014-10-211-0/+2
| | | | | | | | Change-Id: I9bf20507442b0722e93446fdb32d8236be974e28
* | am 583a845c: am 3964ea46: am d74f99d3: Merge "Switch ↵Elliott Hughes2014-07-101-1/+0
|\ \ | |/ | | | | | | | | | | frameworks/base/libs/androidfw to the new icu." * commit '583a845c6eb6308d7ada72cb0e91444efc91cc54': Switch frameworks/base/libs/androidfw to the new icu.
| * Switch frameworks/base/libs/androidfw to the new icu.Elliott Hughes2014-07-091-1/+0
| | | | | | | | Change-Id: Id82830750dd7e83bbc66811a1133b403cc697c97
| * Add libutils dependency for libandroidfw host build.Narayan Kamath2013-12-111-2/+1
| | | | | | | | Change-Id: I7fe0bb466f0b1cdbfef8934da2231ad20f05b648
| * Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2013-12-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Support multiple resource tables with same packageAdam Lesinski2014-06-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to support APK split features, the resource table needs to support loading multiple resource tables with the same package but potentially new set of type IDs. This adds some complexity as the type ID space changes from dense and ordered to potentially sparse. A ByteBucketArray is used to store the type IDs in a memory efficient way that allows for fast retrieval. In addition, the IDMAP format has changed. We no longer need random access to the type data, since we store the types differently. However, random access to entries of a given type is still required. Change-Id: If6f5be680b405b368941d9c1f2b5d2ddca964160
* | Add libutils dependency for libandroidfw host build.Narayan Kamath2014-01-271-2/+1
| | | | | | | | | | | | (cherry picked from commit 070274ec0ccb8643c52e41e4119f356f0f51bc36) Change-Id: I25acff1d36b3adce14b2576485bda93c914d7f5d
* | Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2014-01-271-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 (cherry picked from commit afd31e08299008fdc5c2813f21b2573f29dc53df) Change-Id: Iae67e62f1dc6dfc3f43e29bc38e3ffd1cb14d191
* | Revert "move libandroidfw to frameworks/native"Adam Lesinski2014-01-271-0/+93
| | | | | | | | This reverts commit 84b6292c33d71b5739828d08aa8101d1954577f2.
* | move libandroidfw to frameworks/nativeMike Lockwood2013-10-031-93/+0
|/ | | | Change-Id: Ic5b8a2742c7141156ab0f00ca29097bfe92bce60
* Remove an unused C zip API.Elliott Hughes2013-08-051-1/+0
| | | | Change-Id: I10ae849bdedf3e3bb97547c4f9e5a20742e9d6b1
* add static dependency on liblogColin Cross2013-07-231-0/+2
| | | | Change-Id: I8056aa744b37ef0c31229329a0de79c58c5955ea
* Move input library code to frameworks/native.Jeff Brown2013-07-011-41/+12
| | | | | | | | | No longer compile libandroidfw as a static library on the device since it already exists as a shared library. Keeping the static library would force us to provide a static library version of libinput for the device as well which doesn't make sense. Change-Id: I3517881b87b47dcc209d80dbd0ac6b5cf29a766f
* Move VelocityTracker.cpp to target build onlyNick Kralevich2013-05-211-2/+2
| | | | | | | | | | VelocityTracker.cpp makes reference to property_get, which doesn't make a lot of sense when compiling for the host. Compile this file for the target only. Keyboard.cpp: Remove unnecessary include file. Change-Id: Iee9edd81953b2e7e815005770ce286a6ec586f20
* libutils clean-upMathias Agopian2013-05-071-1/+5
| | | | Change-Id: I11ee943da23a66828455a9770fc3c5ceb4bbcaa9
* Allow compiling aapt for the deviceBjorn Bringert2013-04-261-0/+3
| | | | | | | | | | | | | | Changes: - The static device version of libandroidfw now includes the extra functions needed by aapt. I could only find a few host tools that use the static library, so this is hopefully not a problem. - The pseudolocalization code is moved into aapt. It was previously in libhost, but only used by aapt. Change-Id: Ib393ebb7dcebee8abbb628cbe5255ea1679674ac
* Minor refactoring before starting on velocity tracker changes.Jeff Brown2012-05-111-0/+2
| | | | | Bug: 6413587 Change-Id: I5eba2bb57193bff78cb3740de5f87aca0b31d154
* Request key maps from input manager service.Jeff Brown2012-04-101-0/+1
| | | | | | | | | | | | | | | | | | Instead of each application loading the KeyCharacterMap from the file system, get them from the input manager service as part of the InputDevice object. Refactored InputManager to be a proper singleton instead of having a bunch of static methods. InputManager now maintains a cache of all InputDevice objects that it has loaded. Currently we never invalidate the cache which can cause InputDevice to return stale motion ranges if the device is reconfigured. This will be fixed in a future change. Added a fake InputDevice with ID -1 to represent the virtual keyboard. Change-Id: If7a695839ad0972317a5aab89e9d1e42ace28eb7
* frameworks/base: move Zip* from libandroidfw to libutilsColin Cross2012-03-221-4/+1
| | | | | | | ZipUtils is needed by build/tools, move it from libandroidfw (frameworks/base) to libutils (frameworks/native). Change-Id: I2b4b7adcdf68eb25ee7cba5dd3b69eadf0523af3
* move CursorWindow from libbinder to libandroidfwMathias Agopian2012-02-271-0/+1
| | | | Change-Id: I3b304e4f74e0d0ec8b20c57296c62449c9a0f792
* attempt to fix sdk buildMathias Agopian2012-02-211-0/+3
| | | | Change-Id: I94f32a9a7abccb52487bb9ff5e286faa4acfceff
* another attempt at fixing the linux buildMathias Agopian2012-02-211-1/+1
| | | | Change-Id: Iac20439fd6eea4682859112e72f051294bc87ef6
* another attempt to fix the linux buildMathias Agopian2012-02-211-1/+1
| | | | Change-Id: Ifd4714de7281ffc8a8c90fb25fb34719a19a9b6f
* attempt to fix linux buildsMathias Agopian2012-02-211-1/+1
| | | | Change-Id: I46d6f914fdc32dc26cc71bed3399e202f00eeb2a
* frameworks/base refactoringMathias Agopian2012-02-201-0/+110
create the new libandroidfw from parts of libui and libutils Change-Id: I1584995616fff5d527a2aba63921b682a6194d58