aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.4.1_r1' into HEADcm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0Ricardo Cerqueira2013-12-060-0/+0
|\
| * Fallback to a known good runtime if requested one is not availableBrian Carlstrom2013-10-311-4/+26
* | Merge tag 'android-4.4_r1.2' into cm-11.0Ricardo Cerqueira2013-11-201-4/+26
|\ \
| * | Fallback to a known good runtime if requested one is not availableBrian Carlstrom2013-11-051-4/+26
| |/
* | Merge tag 'android-4.4_r1' into cm-11.0Ricardo Cerqueira2013-11-0118-117/+1477
|\|
| * Add support for ndk libnativehelper build.Ruben Brunk2013-09-105-18/+97
| * am dc8d2bcf: am 416fa5b7: Merge "Switch libnativehelper from statfs to statvfs."Elliott Hughes2013-07-112-3/+3
| |\
| | * am 416fa5b7: Merge "Switch libnativehelper from statfs to statvfs."Elliott Hughes2013-07-092-3/+3
| | |\
| | | * Merge "Switch libnativehelper from statfs to statvfs."Elliott Hughes2013-07-092-3/+3
| | | |\
| | | | * Switch libnativehelper from statfs to statvfs.Elliott Hughes2013-07-092-3/+3
| | | |/
| * | | Renaming dalvik.vm.lib to persist.sys.dalvik.vm.libBrian Carlstrom2013-07-102-4/+5
| * | | Add JNI Invocation API to libnativehelperBrian Carlstrom2013-06-203-3/+189
| |/ /
| * | am cf5ac0ec: Merge "Scoped primitive arrays: allow them to be null"Kenny Root2013-05-201-0/+12
| |\|
| | * Merge "Scoped primitive arrays: allow them to be null"Kenny Root2013-05-201-0/+12
| | |\
| | | * Scoped primitive arrays: allow them to be nullKenny Root2013-05-171-0/+12
| | |/
| * | am 89544997: Merge "Move ScopedFd from libcore to libnativehelper (part 1)"Brian Carlstrom2013-05-141-0/+46
| |\|
| | * Merge "Move ScopedFd from libcore to libnativehelper (part 1)"Brian Carlstrom2013-05-141-0/+46
| | |\
| | | * Move ScopedFd from libcore to libnativehelper (part 1)Brian Carlstrom2013-05-141-0/+46
| | |/
| * | am 442a079e: Merge "Add swap operation to UniquePtr."Brian Carlstrom2013-05-101-0/+6
| |\|
| | * Merge "Add swap operation to UniquePtr."Brian Carlstrom2013-05-101-0/+6
| | |\
| | | * Add swap operation to UniquePtr.Mathieu Chartier2013-05-101-0/+6
| | |/
| * | am 95779265: Merge "Move more utility classes from libcore to libnativehelper...Brian Carlstrom2013-05-107-0/+669
| |\|
| | * Merge "Move more utility classes from libcore to libnativehelper (part 1)"Brian Carlstrom2013-05-107-0/+669
| | |\
| | | * Move more utility classes from libcore to libnativehelper (part 1)Brian Carlstrom2013-05-107-0/+669
| * | | am 66e1bcb7: Merge "Fix punctuation difference in merge resolution"Brian Carlstrom2013-05-101-2/+2
| |\| |
| | * | Merge "Fix punctuation difference in merge resolution"Brian Carlstrom2013-05-101-2/+2
| | |\ \ | | | |/ | | |/|
| | | * Fix punctuation difference in merge resolutionBrian Carlstrom2013-05-101-2/+2
| | |/
| * | Move jniGetReferent to use JniConstantsJeff Brown2013-05-103-0/+9
| * | resolved conflicts for merge of b50e3d9d to jb-mr2-dev-plus-aospBrian Carlstrom2013-05-107-103/+455
| |\|
| | * Merge changes I34de4baf,Ie2b4593d,I4b84a9e1,I664b55d3,I60381a25Brian Carlstrom2013-05-107-84/+455
| | |\
| | | * Manually merge JniConstants changes from 81fd7cc0.Elliott Hughes2013-05-092-0/+6
| | | * Add Calendar, Object, Object[] to well-known listKenny Root2013-05-092-0/+9
| | | * Add InputStream and OutputStream to the well-known classes.Elliott Hughes2013-05-092-0/+6
| | | * Fix build. JniConstants is in libnativehelper, not libcore, in dalvik-dev.Elliott Hughes2013-05-092-3/+0
| | | * Moving libnativehelper additions from libcoreBrian Carlstrom2013-05-097-84/+437
| | |/
* | | Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2Ricardo Cerqueira2013-07-243-45/+62
|\| |
| * | Add a helper to get the referent of a Reference.Jeff Brown2013-04-022-16/+44
| |/
| * Merge "Use <stdint.h> in jni.h for better x86_64 portability."Elliott Hughes2013-02-281-25/+12
| |\
| | * Use <stdint.h> in jni.h for better x86_64 portability.Elliott Hughes2013-02-271-25/+12
| |/
| * Merge "Call JNIEnv FatalError rather than abort(3)."Elliott Hughes2013-01-221-4/+6
|/|
| * Call JNIEnv FatalError rather than abort(3).Elliott Hughes2013-01-221-4/+6
|/
* Make libnativehelper stand-alone.cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingjellybean-stablejellybeancm-10.1Elliott Hughes2012-05-034-86/+26
* Make sure we rethrow the same exception we started with.Jeff Brown2012-04-101-4/+5
* Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\
| * am 92c1f6f1: (-s ours) Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-260-0/+0
| |\
| * | am 1663a6c1: (-s ours) Rename (IF_)LOG() to (IF_)ALOG() DO NOT MERGESteve Block2011-10-251-1/+1
* | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-4/+4
* | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-061-1/+1
| |/ |/|
* | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-1/+1
|/
* Rename (IF_)LOG() to (IF_)ALOG() DO NOT MERGESteve Block2011-10-251-1/+1