aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Load libart.so with RTLD_NODELETEnougat-devAlex Light2016-06-031-3/+7
| | | | | | | | | | During shutdown of libart.so it is possible that threads do not return out of libart.so code prior to JNI_DestroyJavaVM returning. In order to prevent segfaults never unmap libart.so. Bug: 28406866 Change-Id: If52898a5a94f2e41c6634fb4e2cc7059e6436ca4
* Add SocketTagger class to JniConstantsYi Kong2016-04-042-0/+3
| | | | | | Bug: 27291269 Change-Id: Ia7db477a95527491245dbd774d6afe36f88c97c1 (cherry picked from commit 65eaf9973ba76551ae2b95222f9f1a701bdd36ef)
* Workaround for apps using a copy of libnativehelperDimitry Ivanov2016-03-282-0/+25
| | | | | | | | | | | | When this library is loaded by app via greylist it ends up having its own copy of the library which does not have JNI constants properly initialized. This workaround checks the initialization status and initializes them lazily in this case. Bug: http://b/27724707 Change-Id: I4d12913c86a7e8e86c910c90316fc0b94190ac94
* Merge "libnativehelper: remove Android.bp"Colin Cross2016-01-131-5/+0
|\ | | | | | | | | | | | | am: 189cdb6be2 * commit '189cdb6be2e51201ae2149c3936d46ee0bc4cef4': libnativehelper: remove Android.bp
| * Merge "libnativehelper: remove Android.bp"android-n-preview-1brillo-m9-releasebrillo-m9-devbrillo-m10-releasebrillo-m10-devColin Cross2016-01-121-5/+0
| |\
| | * libnativehelper: remove Android.bpColin Cross2016-01-111-5/+0
| |/ | | | | | | | | | | | | | | The name collision will be handled by removing libnativehelper from the root Android.bp file for now. Bug: 25797955 Change-Id: I71a6e3d37c195a56598029262d8808ea9880e109
* | Merge "Untie libnativehelper from libcutils"Dimitry Ivanov2016-01-072-8/+10
|\| | | | | | | | | | | | | am: dbbebce6e4 * commit 'dbbebce6e4074a90726b2d5b29e3de7ed349b41b': Untie libnativehelper from libcutils
| * Merge "Untie libnativehelper from libcutils"Dimitry Ivanov2016-01-072-8/+10
| |\
| | * Untie libnativehelper from libcutilsDimitry Ivanov2016-01-062-8/+10
| |/ | | | | | | | | Bug: http://b/26421034 Change-Id: I2a54bd87d6e29dfcab81f30863059188c0175b1a
* | Merge changes from topic \'aosp-merge-24-12\'Narayan Kamath2015-12-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: d3014724c9 * commit 'd3014724c9a602dfee9cbcbfe3cb6819d0b33454': Omit AsynchronousCloseMonitor.cpp in host/macosx and ndk Move AsynchronousCloseMonitor here from libcore Add a JniConstant for InetSocketAddressHolder. Remove JNI constants related to RealToString. Track renaming of FileDescriptor field. Add a JNI constant for InetAddressHolder. Track usage of OpenJdk's FileDescriptor class. Track switch to OpenJdk's java.text class.
| * Merge changes from topic 'aosp-merge-24-12'Narayan Kamath2015-12-245-9/+183
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Omit AsynchronousCloseMonitor.cpp in host/macosx and ndk Move AsynchronousCloseMonitor here from libcore Add a JniConstant for InetSocketAddressHolder. Remove JNI constants related to RealToString. Track renaming of FileDescriptor field. Add a JNI constant for InetAddressHolder. Track usage of OpenJdk's FileDescriptor class. Track switch to OpenJdk's java.text class.
| | * Omit AsynchronousCloseMonitor.cpp in host/macosx and ndkPrzemyslaw Szczepaniak2015-12-221-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not possible to build buildAsynchronousCloseMonitor.cpp for macosx host because of missing __SIGRTMIN. Thankfully, libcore-host is not built on macosx. Fixes sdk_phone_armv7-sdk (mac) build (cherry picked from commit 7b7052ef86e8362857e322e9ce7f73f02f34200f) Change-Id: Iaba7824c1d2cd3ead59345a0de0e6e0370079b4e
| | * Move AsynchronousCloseMonitor here from libcorePrzemyslaw Szczepaniak2015-12-223-1/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AsynchronousCloseMonitor is needed by both libopenjdk and libjavacore. Bug: 26127752 (cherry picked from commit 20d3848be7394fb9a4735b8b2148f994ff735d96) Change-Id: I7d1d89d344180bb1e6bed2e0c83e4e7633122fe0
| | * Add a JniConstant for InetSocketAddressHolder.Piotr Jastrzebski2015-12-222-0/+3
| | | | | | | | | | | | | | | | | | (cherry picked from commit 39a538702537bab23e21a41c934fdd7b772519e7) Change-Id: I8ed14341ced9edaad723a38563efa543814de5af
| | * Remove JNI constants related to RealToString.Narayan Kamath2015-12-222-3/+0
| | | | | | | | | | | | | | | | | | (cherry picked from commit 830b9bef45a0f372d099fa81db34ade5cdddafb9) Change-Id: Idd3637e8bc0d3c3dab3bb9dc6b4da83d915c02ac
| | * Track renaming of FileDescriptor field.Narayan Kamath2015-12-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | |fd| -> |descriptor|. (cherry picked from commit db32ccab3a3dc16f259eb8f707fee6bbf6a8a4c8) Change-Id: I817f1c70a008466b148e3c6fe80872d394806b71
| | * Add a JNI constant for InetAddressHolder.Piotr Jastrzebski2015-12-222-0/+3
| | | | | | | | | | | | | | | | | | (cherry picked from commit da7720ddf47e60f0b2a926d778b5c65bc91d1c03) Change-Id: I84bb4ecb4e8e8dc06a3282fb123467530ed277e3
| | * Track usage of OpenJdk's FileDescriptor class.Piotr Jastrzebski2015-12-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix jniGetFdFromFileDescriptor and jniSetFileDescriptorOfFd. (cherry picked from commit 1b23abdcbdcd44ba72cea21cb145fad9c43755e3) Change-Id: If25f31f8742fae19083ba53a5b990ba5b2dc86cc
| | * Track switch to OpenJdk's java.text class.Piotr Jastrzebski2015-12-222-4/+0
| |/ | | | | | | | | | | | | | | | | bidiRunClass and fieldPositionIteratorClass are no longer necessary. (cherry picked from commit 03e90fe122f95df27ca74a82bdf2fae343bef769) Change-Id: I714f01fce1fb3b6917304dcf810730bcee2c03e3
* | Omit AsynchronousCloseMonitor.cpp in host/macosx and ndkPrzemyslaw Szczepaniak2015-12-171-4/+10
| | | | | | | | | | | | | | | | | | | | It's not possible to build buildAsynchronousCloseMonitor.cpp for macosx host because of missing __SIGRTMIN. Thankfully, libcore-host is not built on macosx. Fixes sdk_phone_armv7-sdk (mac) build Change-Id: Ia26552baad7e5d1ab0391636d71098f5e2d3bb94
* | Move AsynchronousCloseMonitor here from libcorePrzemyslaw Szczepaniak2015-12-163-1/+170
| | | | | | | | | | | | | | | | AsynchronousCloseMonitor is needed by both libopenjdk and libjavacore. Bug: 26127752 Change-Id: Ia29ba3f46f9cb212e400807a646721ee5c4534be
* | Merge mnc-dr-enso-dev into master.Narayan Kamath2015-11-212-7/+6
|\ \ | |/ |/| | | Change-Id: I304a863a9dbba896e489133f4300d611314d57be
| * Merge lmp changes into mnc.Narayan Kamath2015-11-122-9/+6
| |\
| | * Add a JniConstant for InetSocketAddressHolder.Piotr Jastrzebski2015-11-092-0/+3
| | | | | | | | | | | | Change-Id: I089ee9f9248294451e05d0a78311432f676b264b
| | * Remove JNI constants related to RealToString.Narayan Kamath2015-11-092-3/+0
| | | | | | | | | | | | Change-Id: I72df1338bb054aebba54b90f74d2df49c388c66d
| | * Track renaming of FileDescriptor field.Narayan Kamath2015-11-091-2/+2
| | | | | | | | | | | | | | | | | | |fd| -> |descriptor|. Change-Id: I4fce1fe3a5df1b27a7cd547484a6dcea9565e0d8
| | * Add a JNI constant for InetAddressHolder.Piotr Jastrzebski2015-11-092-0/+3
| | | | | | | | | | | | Change-Id: I33b414920c2f05afcc2fa5a3eaf7914dbc748c51
| | * Track usage of OpenJdk's FileDescriptor class.Piotr Jastrzebski2015-11-091-2/+2
| | | | | | | | | | | | | | | | | | Fix jniGetFdFromFileDescriptor and jniSetFileDescriptorOfFd. Change-Id: I9c239f0ba461d1b5bd4c9ef4896910190690fcd3
| | * Track switch to OpenJdk's java.text class.Piotr Jastrzebski2015-11-092-6/+0
| | | | | | | | | | | | | | | | | | | | | bidiRunClass and fieldPositionIteratorClass are no longer necessary. Change-Id: Id39e46f01a94fb9490d107bdab63eae4a5670635
* | | Merge "Improve ScopedFd API"brillo-m8-releasebrillo-m8-devCasey Dahlin2015-11-201-1/+8
|\ \ \
| * | | Improve ScopedFd APICasey Dahlin2015-11-191-1/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | The class is now final, and has move constructors and move assignment. Change-Id: I5a87cd11dbf2581594919d37c08519302683f46c Test: Full build of android completes successfully Bug: 25242023 Signed-off-by: Casey Dahlin <sadmac@google.com>
* | | Merge "libnativehelper: add dummy Android.bp file"Colin Cross2015-11-191-0/+5
|\ \ \
| * | | libnativehelper: add dummy Android.bp fileColin Cross2015-11-191-0/+5
|/ / / | | | | | | | | | | | | | | | Bug: 25797955 Change-Id: I2bbdfb9040437b16ffe18a86266ec904ad7231dc
* | | am 6481871f: am 50be0353: Merge "Speed up ScopedPrimitiveArrayRO"Mathieu Chartier2015-09-121-7/+19
|\ \ \ | | | | | | | | | | | | | | | | * commit '6481871f9d4449b5f9fe29e771127ae544dc86f7': Speed up ScopedPrimitiveArrayRO
| * \ \ am 50be0353: Merge "Speed up ScopedPrimitiveArrayRO"brillo-m7-releasebrillo-m7-mr-devbrillo-m7-devMathieu Chartier2015-09-121-7/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '50be0353ae7536e620c5666c1b490e78e51592bd': Speed up ScopedPrimitiveArrayRO
| | * \ \ Merge "Speed up ScopedPrimitiveArrayRO"Mathieu Chartier2015-09-121-7/+19
| | |\ \ \
| | | * | | Speed up ScopedPrimitiveArrayROMathieu Chartier2015-09-111-7/+19
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For small arrays <= 1024 elements, we use GetArrayRegion with stack allocated backing storage instead of GetArrayElements. The speedup comes from the fact that GetArrayRegion doesn't need to allocate a copy of array. Timing results for: https://android-review.googlesource.com/#/c/169727/ BEFORE Host: Byte length=1 ns/op=452.2633712 Short length=1 ns/op=468.6469192 Int length=1 ns/op=422.5663486 Long length=1 ns/op=423.4946638 Byte length=8 ns/op=424.8546962 Short length=8 ns/op=424.3842626 Int length=8 ns/op=424.3816324 Long length=8 ns/op=452.9407552 Byte length=64 ns/op=441.674149 Short length=64 ns/op=472.2310028 Int length=64 ns/op=455.6142958 Long length=64 ns/op=487.6810328 Byte length=512 ns/op=454.0858634 Short length=512 ns/op=497.675829 Int length=512 ns/op=481.2103832 Long length=512 ns/op=507.4674306 Byte length=4096 ns/op=531.7923602 Short length=4096 ns/op=648.254466 Int length=4096 ns/op=578.0794842 Long length=4096 ns/op=563.3641424 N5: Byte length=1 ns/op=3118.2292802 Short length=1 ns/op=3083.7797488 Int length=1 ns/op=3177.8996446 Long length=1 ns/op=3151.0892072 Byte length=8 ns/op=3287.7326966 Short length=8 ns/op=3126.5799676 Int length=8 ns/op=3197.3203112 Long length=8 ns/op=3201.0613218 Byte length=64 ns/op=3178.7730612 Short length=64 ns/op=3162.2255092 Int length=64 ns/op=3241.3191864 Long length=64 ns/op=3117.6674886 Byte length=512 ns/op=3106.540978 Short length=512 ns/op=3183.0501344 Int length=512 ns/op=3513.8142382 Long length=512 ns/op=3592.4372798 Byte length=4096 ns/op=3552.9428216 Short length=4096 ns/op=3997.586686 Int length=4096 ns/op=4545.2151442 Long length=4096 ns/op=4371.4996338 AFTER Host: Byte length=1 ns/op=261.764995 Short length=1 ns/op=238.6584262 Int length=1 ns/op=262.856902 Long length=1 ns/op=238.0286378 Byte length=8 ns/op=242.4962264 Short length=8 ns/op=247.8668746 Int length=8 ns/op=263.9420024 Long length=8 ns/op=243.3675294 Byte length=64 ns/op=243.3372902 Short length=64 ns/op=249.0408034 Int length=64 ns/op=250.2168296 Long length=64 ns/op=253.837053 Byte length=512 ns/op=252.8071526 Short length=512 ns/op=271.689653 Int length=512 ns/op=291.8933238 Long length=512 ns/op=341.6303746 Byte length=4096 ns/op=540.8749038 Short length=4096 ns/op=661.7068158 Int length=4096 ns/op=569.030217 Long length=4096 ns/op=565.0571702 N5: Byte length=1 ns/op=1209.4042078 Short length=1 ns/op=1207.2498746 Int length=1 ns/op=1377.0557706 Long length=1 ns/op=1348.6359368 Byte length=8 ns/op=1260.0724162 Short length=8 ns/op=1229.6107912 Int length=8 ns/op=1414.1408952 Long length=8 ns/op=1394.1158746 Byte length=64 ns/op=1232.532947 Short length=64 ns/op=1228.1248122 Int length=64 ns/op=1468.2667912 Long length=64 ns/op=1404.232687 Byte length=512 ns/op=1256.976093 Short length=512 ns/op=1335.5540308 Int length=512 ns/op=1599.6927076 Long length=512 ns/op=1769.8866764 Byte length=4096 ns/op=3310.2486656 Short length=4096 ns/op=3956.6322484 Int length=4096 ns/op=4374.6221234 Long length=4096 ns/op=4256.71598 Bug: 19664826 Change-Id: I703d7346de732199be1feadbead021c6647a554a
* | | | | am f8d86500: (-s ours) am 43563581: Merge "Remove jclass constant for Bidi ↵Neil Fuller2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | to migrate Bidi to ICU4J." * commit 'f8d8650095bc70b31fd5662f0dc41e19dab086d7':
| * | | | am 43563581: Merge "Remove jclass constant for Bidi to migrate Bidi to ICU4J."Neil Fuller2015-08-181-2/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '43563581f7a9fc345291b2d34bb96f72dc643df0': Remove jclass constant for Bidi$Run to migrate Bidi to ICU4J.
* | | | | am a8b8f4cc: (-s ours) am 4dcc14c9: Merge "Libnativehelper: Fix unused ↵Andreas Gampe2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | result warning" * commit 'a8b8f4cc0347359a8e97ac89bb7f138e55349a5f':
| * | | | am 4dcc14c9: Merge "Libnativehelper: Fix unused result warning"Andreas Gampe2015-08-041-4/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '4dcc14c9cfe404d8bf0da199517b546331212a27': Libnativehelper: Fix unused result warning
* | | | | | am c80b5ffb: (-s ours) am e2f79103: Merge "Use __ANDROID__ instead of ↵Elliott Hughes2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HAVE_ANDROID_OS." * commit 'c80b5ffbf2d7b5cdc312903128d8a03e58825de7':
| * | | | | am e2f79103: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."Elliott Hughes2015-07-312-5/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e2f791031746c0c2d84c2abc176846f3574c866c': Use __ANDROID__ instead of HAVE_ANDROID_OS.
* | | | | | | am 48616867: (-s ours) am f85e32ec: Merge "Replace InetUnixAddress with ↵Neil Fuller2015-08-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UnixSocketAddress" * commit '4861686782b5ed228f1062b561741b8f652ca03d':
| * | | | | | am f85e32ec: Merge "Replace InetUnixAddress with UnixSocketAddress"Neil Fuller2015-07-092-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f85e32ec57a23664d9cdff8338903aaae2cf73e3': Replace InetUnixAddress with UnixSocketAddress
* | \ \ \ \ \ \ am 43563581: Merge "Remove jclass constant for Bidi to migrate Bidi to ICU4J."Neil Fuller2015-08-181-2/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit '43563581f7a9fc345291b2d34bb96f72dc643df0': Remove jclass constant for Bidi$Run to migrate Bidi to ICU4J.
| * | | | | | | Merge "Remove jclass constant for Bidi$Run to migrate Bidi to ICU4J."Neil Fuller2015-08-181-2/+0
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Remove jclass constant for Bidi$Run to migrate Bidi to ICU4J.Rayhaan Jaufeerally2015-08-141-2/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifa0f356f49a6252546a71b538b86eaf2c1adf2b8
* | | | | | | am 4dcc14c9: Merge "Libnativehelper: Fix unused result warning"Andreas Gampe2015-08-041-4/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4dcc14c9cfe404d8bf0da199517b546331212a27': Libnativehelper: Fix unused result warning
| * | | | | | Merge "Libnativehelper: Fix unused result warning"android-m-preview-2Andreas Gampe2015-08-041-4/+18
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |