aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* NativeHelper: Switch to Clangandroid-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-devlollipop-cts-releaseAndreas Gampe2014-08-262-0/+5
| | | | Bug: 16404669 Change-Id: I7bf7745684747bad8564f168d0def71878566e8c
* NativeHelper: Do not allow arbitrary library strings in user buildsAndreas Gampe2014-08-255-4/+208
| | | | | | | On device, only allow "libart.so" in non-debuggable (user) builds. Bug: 16404669 Change-Id: Ie163c04ce40c82698dcc98ced651dafef094d8b5
* am 1720265c: am b37e11d0: Merge "libnativehelper: Remove an unused NDK-only ↵Elliott Hughes2014-06-301-19/+0
|\ | | | | | | | | | | | | target" * commit '1720265c3beeebcde06f30f5b37d47011a694a73': libnativehelper: Remove an unused NDK-only target
| * am b37e11d0: Merge "libnativehelper: Remove an unused NDK-only target"Elliott Hughes2014-06-301-19/+0
| |\ | | | | | | | | | | | | * commit 'b37e11d07dec2d49b576709ae8e0568a9daabd07': libnativehelper: Remove an unused NDK-only target
| | * Merge "libnativehelper: Remove an unused NDK-only target"Elliott Hughes2014-06-271-19/+0
| | |\
| | | * libnativehelper: Remove an unused NDK-only targetSam Hasinoff2014-06-301-19/+0
| | |/ | | | | | | | | | Change-Id: Ie162bb4969df7680cf88989a51862148d9779b83
* | | am da7f0439: am 3fa23a6b: Merge "Fixing PrintWriter not being disposed"Elliott Hughes2014-06-271-4/+4
|\| | | | | | | | | | | | | | * commit 'da7f04394acea1101dab429d1056f4ca47b65a22': Fixing PrintWriter not being disposed
| * | am 3fa23a6b: Merge "Fixing PrintWriter not being disposed"Elliott Hughes2014-06-271-4/+4
| |\| | | | | | | | | | | | | * commit '3fa23a6b14e3eb3260090007012281b8b556739d': Fixing PrintWriter not being disposed
| | * Merge "Fixing PrintWriter not being disposed"Elliott Hughes2014-06-261-4/+4
| | |\
| | | * Fixing PrintWriter not being disposedHuanqi Chen2014-06-271-4/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there is an exception being thrown, the getStackTrace method of JNIHelp will initialize a PrintWriter to print the exception message. But the instance of the PrintWriter will not be disposed, because PrintWriter will hold the string reference, and finally the local reference table of VM will overflow. Then system will crash. The change disposes the PrintWriter from the local reference table to prevent the overflow. Change-Id: Ie8dcb3d941034e6e1f480196373189f2d152cf79
* | | am 0e2c05c1: am 83fe0ad3: Merge "Add reset to ScopedFd."Ian Rogers2014-06-231-3/+8
|\| | | | | | | | | | | | | | * commit '0e2c05c1f7df89147e74dc6c937ec7c413429c9c': Add reset to ScopedFd.
| * | am 83fe0ad3: Merge "Add reset to ScopedFd."Ian Rogers2014-06-231-3/+8
| |\| | | | | | | | | | | | | * commit '83fe0ad33202603d738d41d6fca0ce728943a483': Add reset to ScopedFd.
| | * Merge "Add reset to ScopedFd."Ian Rogers2014-06-201-3/+8
| | |\
| | | * Add reset to ScopedFd.Ian Rogers2014-06-211-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | The implementation follows the pattern of UniquePtr. Change-Id: I761c89d393b610600e863e223f2545ded1fde441
* | | | am 1e01ac68: am 689a91a6: Merge "Host multilib for multilib ART support."Ian Rogers2014-06-221-0/+1
|\| | | | | | | | | | | | | | | | | | | * commit '1e01ac6874f92e78685b13d48b04b70449fa8d4b': Host multilib for multilib ART support.
| * | | am 689a91a6: Merge "Host multilib for multilib ART support."Ian Rogers2014-06-221-0/+1
| |\| | | | | | | | | | | | | | | | | | * commit '689a91a618d0f59fd754fc7cf12d8f3ea086691c': Host multilib for multilib ART support.
| | * | Merge "Host multilib for multilib ART support."Ian Rogers2014-06-221-0/+1
| | |\ \ | | | |/ | | |/|
| | | * Host multilib for multilib ART support.Ian Rogers2014-06-161-0/+1
| | |/ | | | | | | | | | Change-Id: I375bff0f7f242f48fc2674c1d502501ff2197396
* | | am 3a620bf9: am 19f6fb99: am c72d0515: Merge "Move to dalvik.vm.lib.2 to ↵Brian Carlstrom2014-05-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | force default to libart" * commit '3a620bf9c93573a219a430cc58b7afd51377bf57': Move to dalvik.vm.lib.2 to force default to libart
| * | am 19f6fb99: am c72d0515: Merge "Move to dalvik.vm.lib.2 to force default to ↵Brian Carlstrom2014-05-281-1/+1
| |\| | | | | | | | | | | | | | | | | | | libart" * commit '19f6fb99d41703ae377b5e8eaa93e785a9e7c605': Move to dalvik.vm.lib.2 to force default to libart
| | * am c72d0515: Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-1/+1
| | |\ | | | | | | | | | | | | | | | | * commit 'c72d05151ceab04fa8c12a1bd26a8a787644a6d1': Move to dalvik.vm.lib.2 to force default to libart
| | | * Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-1/+1
| | | |\
| | | | * Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14298175 (cherry picked from commit ddfc32a279eb575380cc3a601cbd989f0177d3be) Change-Id: I901e35bc43fbc18be3052863429897f133c8d37d
* | | | Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 14298175 Change-Id: Icc8e62dd7a8ce25e62e9c1a1a2e7d9166043a956
* | | | merge in master-release history after reset to ↵The Android Automerger2014-05-220-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | e9a01e6fb2431122afd4476932c139999d6c525c
| * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-220-0/+0
|/| | | | | | | | | | | | | | | | | | | e9a01e6fb2431122afd4476932c139999d6c525c
| * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-210-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 62c60b9a9fc2a9e97b4576257676f18fadd92a14
| | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-200-0/+0
| |/| | | | | | | | | | | | | | | | | | | | | | 62c60b9a9fc2a9e97b4576257676f18fadd92a14
| | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-190-0/+0
| |/| | | | | | | | | | | | | | | | | | | | | | 62c60b9a9fc2a9e97b4576257676f18fadd92a14
| | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-180-0/+0
| |/| | | | | | | | | | | | | | | | | | | | | | 62c60b9a9fc2a9e97b4576257676f18fadd92a14
| | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-170-0/+0
| |/| | | | | | | | | | | | | | | | | | | | | | 62c60b9a9fc2a9e97b4576257676f18fadd92a14
| | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-150-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | a7104a806f863fd5a88cac4aed10c38b94fc9c95
| | | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-140-0/+0
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | a7104a806f863fd5a88cac4aed10c38b94fc9c95
| | | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-130-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8c6319e0194b3f6f4695d3553fc350a9f11e5759
| | | | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-120-0/+0
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c6319e0194b3f6f4695d3553fc350a9f11e5759
| | | | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-110-0/+0
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c6319e0194b3f6f4695d3553fc350a9f11e5759
| | | | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-100-0/+0
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c6319e0194b3f6f4695d3553fc350a9f11e5759
| | | | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-080-0/+0
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c6319e0194b3f6f4695d3553fc350a9f11e5759
| | | | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-070-0/+0
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 23711d76cc3d52e4949c9c53d73a7dc227bb98ea
| | | | | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-070-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23711d76cc3d52e4949c9c53d73a7dc227bb98ea
| | | | | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-060-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23711d76cc3d52e4949c9c53d73a7dc227bb98ea
| | | | | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-050-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23711d76cc3d52e4949c9c53d73a7dc227bb98ea
| | | | | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-040-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23711d76cc3d52e4949c9c53d73a7dc227bb98ea
| | | | | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-030-0/+0
| | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23711d76cc3d52e4949c9c53d73a7dc227bb98ea
| | | | | * | | | merge in master-release history after reset to ↵The Android Automerger2014-05-010-0/+0
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e912352008df41eacbe0ac1f1828256ff7f6c841
| | | | | | * \ \ \ merge in master-release history after reset to ↵The Android Automerger2014-04-300-0/+0
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bda8dcdf5afe544cc26f44cb0418f73dcf98a880
| | | | | | | * | | | merge in master-release history after reset to ↵The Android Automerger2014-04-290-0/+0
| | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bda8dcdf5afe544cc26f44cb0418f73dcf98a880
| | | | | | | * | | | merge in master-release history after reset to ↵The Android Automerger2014-04-280-0/+0
| | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bda8dcdf5afe544cc26f44cb0418f73dcf98a880
| | | | | | | * | | | merge in master-release history after reset to ↵The Android Automerger2014-04-270-0/+0
| | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bda8dcdf5afe544cc26f44cb0418f73dcf98a880
| | | | | | | * | | | merge in master-release history after reset to ↵The Android Automerger2014-04-260-0/+0
| | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bda8dcdf5afe544cc26f44cb0418f73dcf98a880