aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Snap for 6859336 from 67ebae821c782461d69beb1d9d27d9ca6979d27a to ↵simpleperf-releaseandroid-build-prod (mdb)2020-09-244-135/+0
|\ | | | | | | simpleperf-release" into simpleperf-release
| * Snap for 6859336 from 67ebae821c782461d69beb1d9d27d9ca6979d27a to ↵android-build-prod (mdb)2020-09-234-135/+0
|/| | | | | | | | | | | simpleperf-release Change-Id: I70398c208a31fafd0826257a406bc01c6bbc2a6c
| * Merge "Remove ScopedBytes.h and scoped_bytes.h"Orion Hodson2020-09-234-135/+0
| |\
| | * Remove ScopedBytes.h and scoped_bytes.hOrion Hodson2020-09-234-135/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | Repeat lookup of primitive byte array by ScopedBytes shows up in dogfood telemetry. ScopedBytes is a header-only include in libnativehelper so cannot use the caching mechanism there. Since it is only used in libcore, this change is part of moving it there and fixing the repeat lookups. Bug: 168471625 Test: m Change-Id: I8ef1af553ecd9529ee2abf40a9ed555e1a47b709
* | Merge "Snap for 6844436 from d40208981bc4efcea4ce47bc07fda7b86d6de212 to ↵android-build-prod (mdb)2020-09-170-0/+0
|\ \ | | | | | | | | | simpleperf-release" into simpleperf-release
| * | Snap for 6844436 from d40208981bc4efcea4ce47bc07fda7b86d6de212 to ↵android-build-prod (mdb)2020-09-170-0/+0
|/| | | |/ | | | | | | | | simpleperf-release Change-Id: I19e77e6f9e5270996839310c3e33662e9da8ec6c
| * Merge "Fix an issue where a pointer was used instead of a char*" am: ↵Treehugger Robot2020-07-141-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | 84e576a16b am: 63dd56d814 Original change: https://android-review.googlesource.com/c/platform/libnativehelper/+/1361506 Change-Id: I1745f702cd42aa201adeacd91f1eb7b10b2d0768
| * \ Merge "Add FileDescriptor NDK methods" am: 4d480bccc1 am: 82c23c10cbTreehugger Robot2020-07-065-4/+168
| |\ \ | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/libnativehelper/+/1354105 Change-Id: Iee3ba65dba28602bb5ec98b3707e8712b0e349ec
| * \ \ Merge "Rename and move CtsLibnativehelperTestCases" am: 543fe2b957 am: ↵Orion Hodson2020-06-2614-1/+909
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39d9fb2519 Original change: https://android-review.googlesource.com/c/platform/libnativehelper/+/1351062 Change-Id: Ie80364ad5242d4d006e42f9f676133501aa71e5b
| * \ \ \ [automerger skipped] Merge "libnativehelper API split" am: 867bee3f23 am: ↵Orion Hodson2020-06-250-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56ec0dbd34 -s ours am skip reason: Change-Id If2f563ea5c82882d3a77a7b9af7c508bfa8acc6e with SHA-1 511dfd5184 is in history Original change: https://android-review.googlesource.com/c/platform/libnativehelper/+/1348766 Change-Id: I9bda0dd4644612f768707d29f0c06e43e2794913
| * | | | | libnativehelper API splitOrion Hodson2020-06-2419-474/+740
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split JNIHelp.h into JNIHelp.h and JNIPlatformHelp.h. The former contains methods that depend on public Java API. The latter contains methods primarily intended for platform that depend on non-public Java API fields and methods, e.g j.l.FileDescriptor. Place JNIPlatformHelp.h and JniInvocation.h under include_platform/. Remove API covered by JNIPlatform.h from libnativehelper_compat_libc++. Any code that requires these methods should use libnativehelper instead. Rename platform_include/ to include_platform_header_only/. Bug: 151443957 Test: atest CtsLibnativehelperTestCases Test: Treehugger Change-Id: If2f563ea5c82882d3a77a7b9af7c508bfa8acc6e Merged-In: If2f563ea5c82882d3a77a7b9af7c508bfa8acc6e Exempt-From-Owner-Approval: cherry pick (cherry picked from commit e77eceff3521ff44382afc0540924247a57fa908)
| * | | | | Merge "Improve failure message of jniRegisterNativeMethods" am: 430d06f39a ↵Treehugger Robot2020-06-162-3/+22
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f2845a96b7 Original change: https://android-review.googlesource.com/c/platform/libnativehelper/+/1331153 Change-Id: I27df7ca38a629aa660b3744189b755c02820a843
| * \ \ \ \ \ [automerger skipped] Merge "Move modules whitelisting libnativehelper libs ↵Treehugger Robot2020-06-150-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from soong" am: d4d3bdb934 am: dff07976f6 -s ours am skip reason: Change-Id Id2216b4e59e0960e6abc472d3006a5e60156dc75 with SHA-1 6d8a15ec4e is in history Original change: https://android-review.googlesource.com/c/platform/libnativehelper/+/1331154 Change-Id: I41f5450e6f18231eae433590a032083dc6cc3587
| * | | | | | | Move modules whitelisting libnativehelper libs from soongOrion Hodson2020-06-151-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change updates the apex_available and visibility properties of libnativehelper_compat_libc++. This facilitates tracking the dependencies on these libraries. Bug: 147364041 Bug: 151443957 Test: m nothing Change-Id: Id2216b4e59e0960e6abc472d3006a5e60156dc75 Merged-In: Id2216b4e59e0960e6abc472d3006a5e60156dc75 Exempt-From-Owner-Approval: cherry pick (cherry picked from commit 41bd81fdb4b4038303d600824ebbde7b47ccfcd3)
| * | | | | | | Merge "Delete local reference in toStringArray() error paths" am: 60621832eb ↵Treehugger Robot2020-06-081-3/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 666e279abf Original change: https://android-review.googlesource.com/c/platform/libnativehelper/+/1324169 Change-Id: I72cf008f6fcfb2e92b80d0a5c9dae711a71b34d6
| * \ \ \ \ \ \ \ [automerger skipped] Merge "Make libnativehelper_header_only APEX available" ↵Treehugger Robot2020-06-010-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0c83a44cac am: 6a1c327258 -s ours am skip reason: Change-Id I98651c7cf07fc3b89f2ee46d5a7a019cee329abf with SHA-1 24c4751f82 is in history Change-Id: Ie42e90289867ddefd8c0e5357601032f7a8c540a
| * \ \ \ \ \ \ \ \ Make libnativehelper_header_only APEX available am: 24c4751f82Orion Hodson2020-05-301-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic5499862fdd95bfa010e0de5544882239eed1975
| | * | | | | | | | | Make libnativehelper_header_only APEX availableandroid11-devOrion Hodson2020-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables libstats_jni to use ScopedLocalRef. Bug: 157711673 Test: m nothing (with this topic) Change-Id: I98651c7cf07fc3b89f2ee46d5a7a019cee329abf
| * | | | | | | | | | Merge "Fix JNI_GetCreatedJavaVMs" am: 0b0d92c7be am: 418abbe2fdOrion Hodson2020-05-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b2fefbc565f114668e921bb22e3c2d405eb6ff1
| * \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Set apex_available property" am: b64660cf8f am: ↵Treehugger Robot2020-05-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9fb27e7ca -s ours am skip reason: Change-Id I2b80a7f2cb854d4518c8a74bfc6d3a84acad8d73 with SHA-1 ad9fce1a13 is in history Change-Id: Ief81b9899ac544d5f8583506a85fa68902abcdec
| * \ \ \ \ \ \ \ \ \ \ \ Set apex_available property am: ad9fce1a13Jiyong Park2020-05-041-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie597a1aa03a0387cc565459f2056b459556b1144
| | * | | | | | | | | | | Set apex_available propertyJiyong Park2020-04-291-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The marked library(ies) were available to the APEXes via the hand-written whitelist in build/soong/apex/apex.go. Trying to remove the whitelist by adding apex_available property to the Android.bp of the libraries. Bug: 150999716 Test: m Change-Id: I2b80a7f2cb854d4518c8a74bfc6d3a84acad8d73
| * | | | | | | | | | | | Merge "Enable libnativehelper as a public library." am: 9c24e5ea56 am: ↵Orion Hodson2020-05-041-6/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e754e7384 Change-Id: If3ed98173608ce7636e6d368b63edebc95110a72
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix cut-and-paste-o in JNI_GetCreatedJavaVMs symbol binding" am: ↵Treehugger Robot2020-05-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a1d6b31dc am: d693c2f53f Change-Id: I3aed569a5d979b29143d4ccda8c8426c32861afb
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Complete rename of JniInvocation_test to libnativehelper_tests" am: ↵Treehugger Robot2020-04-293-73/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 57b8a121c8 am: a5c2c3b927 Change-Id: Ib4132ed7e7c38efcd3da7fec83a11896b3ea46d1
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han2020-04-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e01d30242c -s ours am skip reason: Change-Id I831bf9f87b520110b5460915e2d7c5814c1dba49 with SHA-1 a727a250d7 is in history Change-Id: I0d7f547a25316740dbd38b5d1e18febfe3483e80
| | * | | | | | | | | | | | | | Set min_sdk_version to be part of mainline modulesJooyung Han2020-04-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Bug: 152655956 Test: m Merged-In: I831bf9f87b520110b5460915e2d7c5814c1dba49 Change-Id: I831bf9f87b520110b5460915e2d7c5814c1dba49 (cherry picked from commit a727a250d76565202d5d57681acbab94e88f13ca)
| * | | | | | | | | | | | | | | Merge "Set min_sdk_version to be part of mainline modules" am: 6a5ec92e2d ↵Treehugger Robot2020-04-281-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: caacea1c9f Change-Id: I2dcc81c79ce2491329cb3031825abce1d33e5e4f
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove MODULE_LICENSE_APACHE2 from libnativehelper" am: f51c0f4fb3 ↵Bob Badour2020-04-281-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 019f60cf78 Change-Id: I7f6bc51719a53786b302d79818451feb2fe0e325
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge changes from topic "lnh-invocation" am: 1f0598df8b am: c4dc5eba1fOrion Hodson2020-04-283-115/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If033ced16024c648a96c5c8cd9c37d4b6269b88e
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Revert to previous behavior of JniInvocationImpl::GetLibrary." am: ↵Nicolas Geoffray2020-04-261-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21039fae13 am: 2b671fb518 Change-Id: I7a95190d558dc1eb8bb150a9ba1f6df561221a56
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Move all libnativehelper gtests to common binary" am: 07149de887 am: ↵Treehugger Robot2020-04-248-68/+79
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1ed98b428 Change-Id: I00bcc0579edadd6f7cb05bc88bdbeda27312589f
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge changes from topic "one-lnh" am: 7d63cbbab6 am: d8660a2afdOrion Hodson2020-04-2439-1142/+1264
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0b8558b09242fb8f6208741bdc83b3406f9c8f5c
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "header_only_include header updates" am: ddc5ba1f41 am: ff514b5a57Treehugger Robot2020-04-2115-33/+241
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia19e6e8ff6a51cf0a0074b1c7196a6c53133e973
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add stddef.h to scoped_primitive_array.h." am: c7bc9dfd66 am: 96b67c1714Nicolas Geoffray2020-04-211-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idd7ffc8785b106b274e872dbeb2f3cf2fe99bf2d
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add recovery_available for jni_headers" am: 4b0f837233 am: 496520081cTreehugger Robot2020-04-141-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icd9d3dcaf2fd7d2d0d650ecb3d08016702f511e6
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 920b97e8e5 -s ours am skip reason: subject contains skip directive Change-Id: I45f566b17212b34ad4cbee607ba18fa2a628336f
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Drop FileDescriptor ownerId field from libnativehelper" am: ↵Orion Hodson2020-04-085-25/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3039bfbb82 am: ab368e8894 Change-Id: I530eb4a305fc62ff34d2f7d5fc645ce9a2c875c5
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add include_jni to the exported include dirs" am: 846808cb41 am: ↵Orion Hodson2020-04-071-4/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbe8436e0c Change-Id: Ia600440fee4e051bdf5bea964e2d293daeb3a4e2
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Make jni_headers more widely available" am: 527441cd75 am: 9794867f7eTreehugger Robot2020-04-021-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I235fd6941316b44f78324c3cdb4616e9813df227
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge changes from topic "oth-lnh-cleanup" am: 3e02f0314b am: 7a651a2b5eOrion Hodson2020-03-243-133/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7049cba579b8003fdb6f448455674c24b41c3348
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Simplify toStringArray implementation" am: 4be187acae am: 030b497678Orion Hodson2020-03-206-94/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1c91998cb79ecdf897760e3a23bc8ee78bce43c6
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li2020-03-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 1d5654a785 -s ours am skip reason: subject contains skip directive Change-Id: I44b5ca842b5db4e639a0a8b2d947ecaddcbe434f
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Retire jniStrError" am: 209c218d24 am: 6beaea5ec2Treehugger Robot2020-03-183-21/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id41d1e413895dcc37e9fc869c3999bd63dc9f2e0
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add OWNERS file" am: dac0627808 am: 382fa1bfeaAutomerger Merge Worker2020-02-251-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9a7e0b74c0b1d764bfa1692f68c0cce1d344126c
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "libnativehelper is available to ↵Automerger Merge Worker2020-02-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | com.android.bluetooth.updatable" am: 3827af8bf7 am: 4cfdb54e20 am: 48f7c21701 -s ours am skip reason: Change-Id Id7b02ebd248be9a5ec644053bd06e510fd975727 with SHA-1 84654d72e2 is in history Change-Id: Ifd791aa2c044e0d353085dcb32a760962dc14f3d
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "libnativehelper is available to com.android.bluetooth.updatable"TreeHugger Robot2020-02-061-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libnativehelper is available to com.android.bluetooth.updatableJiyong Park2020-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The library is currently depended on by Bluetooth.apk in the bluetooth apex. Until the dependency is dropped, allow libnativehelper to be included in the apex. Or, we might want to allow libnativehelper to be available to everywhere. This makes sense because the library actually doesn't share any private info with ART. It is a thin wrapper around the standard JNI to ease the creation of jni libraries. Bug: 143733063 Bug: 147671264 Test: m Change-Id: Id7b02ebd248be9a5ec644053bd06e510fd975727
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "libnativehelper: Fix templates for clang-r377782 update." am: ↵Automerger Merge Worker2020-02-051-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5a25d8f85 am: 59958e97d0 am: 914fac9c1b Change-Id: Icd7d0a5a459203c4e1fcd9a61a0cb7826e9aa3be
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "libnativehelper: restrict libbase dependency" am: 1ee6a47a19 am: ↵Automerger Merge Worker2020-02-042-10/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f36fa39201 am: 88b8aeb734 Change-Id: Ib9600d63a3fffecc2eae6f360f2608f38da01b0c
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-08 06:13:39 +0000