aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Move default libnativehelper include to mock dir." am: cfdbad8210 am: ↵oreo-mr1-devSteven Moreland2017-07-1916-1144/+1156
|\ | | | | | | | | | | | | | | 0b6891cc21 am: 8f559c1cbd am: ca197a2c10 Change-Id: I72d1cd7801b7076c055e49678a48a267d9fe15d4
| * Merge "Move default libnativehelper include to mock dir." am: cfdbad8210 am: ↵Steven Moreland2017-07-1916-1144/+1156
| |\ | | | | | | | | | | | | | | | | | | | | | 0b6891cc21 am: 8f559c1cbd Change-Id: Icadd0e098c8c8c52772cf86506d96f1535c2a7e9
| | * Merge "Move default libnativehelper include to mock dir." am: cfdbad8210Steven Moreland2017-07-1916-1144/+1156
| | |\ | | | | | | | | | | | | | | | | | | | | am: 0b6891cc21 Change-Id: If61db9476ad8dd395cdf042043f7488471c7932b
| | | * Merge "Move default libnativehelper include to mock dir."Steven Moreland2017-07-1916-1144/+1156
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | am: cfdbad8210 Change-Id: I8e11679922ff102b6aacc604b71ca5fcebf3b51a
| | | | * Merge "Move default libnativehelper include to mock dir."Treehugger Robot2017-07-1916-1144/+1156
| | | | |\
| | | | | * Move default libnativehelper include to mock dir.Steven Moreland2017-07-1816-1144/+1156
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include_deprecated contains all of the headers that are currently used by libraries without the "nativehelper/" prefix. The current count of this is this: 2 ScopedLocalFrame.h 4 JniInvocation.h 4 ScopedBytes.h 5 AsynchronousCloseMonitor.h 6 toStringArray.h 7 ScopedStringChars.h 38 JniConstants.h 41 ScopedPrimitiveArray.h 79 ScopedUtfChars.h 80 UniquePtr.h 100 ScopedLocalRef.h 467 JNIHelp.h Now we can remove each file from the global header include on a file by file basis. Bug: 63762847 Test: libraries still find their headers Change-Id: I77f1dcff47389bcce55087fe18c46350992e4e06
* | | | | Merge "Add jni_headers to export only jni.h to vendor and platform." am: ↵Jiyong Park2017-07-172-1/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e942ba689 am: 09b2f6273c am: 8d9a6e1f58 am: cd21970e01 Change-Id: I098f94f296b66eac451ee111a12caa0f79eebc35
| * | | | Merge "Add jni_headers to export only jni.h to vendor and platform." am: ↵Jiyong Park2017-07-172-1/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e942ba689 am: 09b2f6273c am: 8d9a6e1f58 Change-Id: I61aa873e064afd0aa5f57f948098aed1d502cc56
| | * | | Merge "Add jni_headers to export only jni.h to vendor and platform." am: ↵Jiyong Park2017-07-172-1/+13
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e942ba689 am: 09b2f6273c Change-Id: Id048c75958bac87972ac7542aaf9eec33cbb6de5
| | | * | Merge "Add jni_headers to export only jni.h to vendor and platform."Jiyong Park2017-07-172-1/+13
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 1e942ba689 Change-Id: Ida5eb74c0098a4eb33107ed963055d78d2b17e2c
| | | | * Merge "Add jni_headers to export only jni.h to vendor and platform."android-o-preview-4Treehugger Robot2017-07-172-1/+13
| | | | |\
| | | | | * Add jni_headers to export only jni.h to vendor and platform.Jiyong Park2017-07-172-1/+13
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jni.h is part of the NDK and is guaranteed to be stable also for VNDK When BOARD_VNDK_VERSION is set, libnativehelper/include/nativehelper is not in the include paths for vendors and thus jni.h is not accessible for them. Since jni.h is essential for any JNI lib, this prevents vendors from building JNI libs. So, in order to give access to just jni.h, but not others headers such as JNIHelp.h or UniquePtr.h in the same directory, a header-only lib 'jni_header' is defined. This will be used by both vendor and system components to get access to jni.h. Note: if a JNI lib does not use non-NDK libs (such as libcutils, libutils, libase, etc.) then setting LOCAL_SDK_VERSION allows jni.h without requiring them to depend on libnativehelper_headers. This header-only lib is useful when the JNI lib uses the non-NDK libs and thus LOCAL_SDK_VERSION cannot be an option. Bug: 37342627 Bug: 63553556 Followup: Bug: 63762847 Test: BOARD_VNDK_VERSION=current m -j <lib> <lib> can be vendors' JNI lib such as liblistenjni, libsensor_reg, etc. Change-Id: Ic57f63b046a50cbb4b10e8c91fb6a5a355f9d03a
* | | | | Merge "Add JNI helper function jniCreateString()." am: a22102d917 am: ↵Fredrik Roubert2017-07-172-0/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 286e2ee784 am: 1f50bb2da5 am: b2ba998f3d Change-Id: I37998a4885af9cdd63248bf3f3e372325f184eda
| * | | | Merge "Add JNI helper function jniCreateString()." am: a22102d917 am: 286e2ee784Fredrik Roubert2017-07-172-0/+20
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1f50bb2da5 Change-Id: I77c4ba3f81021cded1e0ceca982e1785214855bc
| | * | | Merge "Add JNI helper function jniCreateString()." am: a22102d917Fredrik Roubert2017-07-172-0/+20
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 286e2ee784 Change-Id: Ib0e7dd8c370cf2697ab3684fa1bff1e21efceecb
| | | * | Merge "Add JNI helper function jniCreateString()."Fredrik Roubert2017-07-172-0/+20
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: a22102d917 Change-Id: I66fdb72ebc6ae253948615cc85dfbeeec9cde0b5
| | | | * Merge "Add JNI helper function jniCreateString()."Treehugger Robot2017-07-172-0/+20
| | | | |\
| | | | | * Add JNI helper function jniCreateString().Fredrik Roubert2017-07-172-0/+20
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In C++11, char16_t and uint16_t (which is what jchar is defined as) are two distinct types, even though they are bitwise identical, so to not require C++11 code using char16_t to always reinterpret_cast<uint16_t> the argument passed to JNIEnv::NewString(), this new helper function is overloaded to do the required cast when used in C++11. Bug: 37554848 Test: make Change-Id: I69632b0a7b822537cab77c43dc387d94917933b9
* | | | | Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" am: ↵Przemyslaw Szczepaniak2017-07-172-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | faaa80e17c am: 70d4d8bbf9 am: 189e7c2012 am: 06a8e0eecb Change-Id: I7be3474ab594980b3561f8db0dfed50a53aee604
| * | | | Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" am: ↵Przemyslaw Szczepaniak2017-07-172-0/+3
|/| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | faaa80e17c am: 70d4d8bbf9 am: 189e7c2012 Change-Id: I2fe51350a7c8114d5b340117928a43efe13ce9ae
| * | | Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" am: ↵Przemyslaw Szczepaniak2017-07-172-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | faaa80e17c am: 70d4d8bbf9 Change-Id: I9b6061a630b2f6ed31e56669289143f932ac63ab
| | * | Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0"Przemyslaw Szczepaniak2017-07-172-0/+3
| |/| | | | |/ | | | | | | | | | | | | am: faaa80e17c Change-Id: Iac2b8ea8f224ab85234828082bc5addb0c89473f
| | * Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0"Przemyslaw Szczepaniak2017-07-172-0/+3
| | |\
| | | * Track libcore commit 58228b82c64808eddac02736f18f5003730443a0Przemyslaw Szczepaniak2017-07-132-0/+3
| | |/ | | | | | | | | | | | | | | | Test: CtsLibcoreTestCases Bug: 62949898 Change-Id: I9285d65ec106666b66565c17a18f7d45a18fc8e8
* | | Merge "Add test config to JniInvocation_test" am: 7e7c5b9a8b am: d0865381b9 ↵android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21oreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devDan Shi2017-03-312-0/+27
|\| | | | | | | | | | | | | | | | | | | | | | | am: d1c6bf341b am: 4e7b9cfb89 Change-Id: I6be1ad92f1c977547d4372efd9f41ad519856960
| * | Merge "Add test config to JniInvocation_test" am: 7e7c5b9a8b am: d0865381b9Dan Shi2017-03-312-0/+27
|/| | | | | | | | | | | | | | | | | am: d1c6bf341b Change-Id: I2946965e24f620ba610517f1306d7c7993a0d86b
| * | Merge "Add test config to JniInvocation_test" am: 7e7c5b9a8bDan Shi2017-03-312-0/+27
| |\| | | | | | | | | | | | | | | | am: d0865381b9 Change-Id: Icb009ed4cad697b235a6714d3216f94d4968da75
| | * Merge "Add test config to JniInvocation_test"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Dan Shi2017-03-312-0/+27
| | |\ | | | | | | | | | | | | | | | | | | | | am: 7e7c5b9a8b Change-Id: I666833e74f70fb39e946f932b733eae2432c5d1e
| | | * Merge "Add test config to JniInvocation_test"Treehugger Robot2017-03-312-0/+27
| | | |\
| | | | * Add test config to JniInvocation_testDan Shi2017-03-292-0/+27
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Design doc: Generalized Suites & the Unification of APCT & CTS Workflows Design/Roadmap https://docs.google.com/document/d/1eabK3srlBLouMiBMrNP3xJPiRRdcoCquNxC8gBWPvx8/edit#heading=h.78vup5eivwzo Details about test configs changes are tracked in doc https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit# Bug: 35882476 Test: local test Change-Id: I960ae8d6c1d2b2a489e8d11b534be5127ea8d018
* | | | Merge "Stop using __system_property_area__" am: 90c12683ee am: 0ce0b54a0eandroid-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-releaseVictor Khimenko2017-03-011-8/+1
|\| | | | | | | | | | | | | | | | | | | | | | | am: 369e25dccb Change-Id: I1921850653794829a1e0df168afe71cebdc5a795
| * | | Merge "Stop using __system_property_area__" am: 90c12683eeVictor Khimenko2017-03-011-8/+1
| |\| | | | | | | | | | | | | | | | | | | | | | am: 0ce0b54a0e Change-Id: I01b9d03383c733bca41d508a5304c6f38d5d892f
| | * | Merge "Stop using __system_property_area__"Victor Khimenko2017-03-011-8/+1
| | |\| | | | | | | | | | | | | | | | | | | | | am: 90c12683ee Change-Id: I0afb47de26af57c9568047a6f29370125aee203f
| | | * Merge "Stop using __system_property_area__"android-o-preview-1android-n-mr2-preview-2o-previewVictor Khimenko2017-03-011-8/+1
| | | |\
| | | | * Stop using __system_property_area__Victor Khimenko2017-02-281-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently that "backdoor" is no longer needed - the proper way is to reinitialize properties: https://android-review.googlesource.com/#/c/181794/24/tests/system_properties_test.cpp Test: refactoring CL, existsing tests still pass BUG=21852512 Change-Id: I2fe193d65a0e6804bfc15726d9b973a97b378fef
* | | | | Merge "jni: Add platform-private convenience headers" am: 877075b557 am: ↵Igor Murashkin2017-02-212-1/+85
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 804d81fb29 am: 0f94e5c0b6 Change-Id: Ib4757ca028649f9201d7a58a03f93ac4e84fafaa
| * | | | Merge "jni: Add platform-private convenience headers" am: 877075b557Igor Murashkin2017-02-212-1/+85
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 804d81fb29 Change-Id: I5f6bc88a946c00b93cb501afbeaecf6bbfbf20de
| | * | | Merge "jni: Add platform-private convenience headers"Igor Murashkin2017-02-212-1/+85
| |/| | | | | |/ / | | | | | | | | | | | | | | | | am: 877075b557 Change-Id: Ie7fe64098c7205ace9543aba80675e69b033303c
| | * | Merge "jni: Add platform-private convenience headers"Treehugger Robot2017-02-212-1/+85
| | |\ \ | | | |/ | | |/|
| | | * jni: Add platform-private convenience headersIgor Murashkin2017-02-172-1/+85
| | |/ | | | | | | | | | | | | | | | | | | | | | Add macros to simplify registration of both regular and @FastNative JNI functions. Bug: 34955272 Change-Id: If07dbd82452a28de6dcea978d46b4805d1f0eeea
* | | Merge "Add license to ndk_headers." am: b1d6844f1d am: 5076d453e7Dan Albert2016-10-201-0/+1
|\| | | | | | | | | | | | | | | | | am: 07010f506c Change-Id: I2d8bed85569d5f3cf0e1c8b4fec60d2b99322dd9
| * | Merge "Add license to ndk_headers." am: b1d6844f1dDan Albert2016-10-201-0/+1
| |\| | | | | | | | | | | | | | | | am: 5076d453e7 Change-Id: If51b7044cca8871a8ed599941d2f6edc275db3a4
| | * Merge "Add license to ndk_headers."android-n-mr2-preview-1Dan Albert2016-10-201-0/+1
| |/| | | | | | | | | | | | | | | | am: b1d6844f1d Change-Id: I7bbc84d3f553d0b23520adabd7c480158a3d48ca
| | * Merge "Add license to ndk_headers."Treehugger Robot2016-10-201-0/+1
| | |\
| | | * Add license to ndk_headers.Dan Albert2016-10-201-0/+1
| | |/ | | | | | | | | | | | | | | | Test: make ndk Bug: None Change-Id: I9cf8203239534831017537cb0daea11decbdf746
* | | Add move semantics to ScopedUtfCharsAdam Lesinski2016-10-111-9/+32
| | | | | | | | | | | | | | | Test: manual Change-Id: Ibcac9b21328f5e0549075443005ac721451d9fac
* | | Merge "Fix google-explicit-constructor warnings." am: 52197e3286 am: ↵Chih-Hung Hsieh2016-08-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | f04e5ddd4e am: 990e56bbae am: 66e07fb715 Change-Id: I047030c004a59854006baf445ff13f994ec388be
| * | Merge "Fix google-explicit-constructor warnings." am: 52197e3286 am: f04e5ddd4eChih-Hung Hsieh2016-08-151-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | am: 990e56bbae Change-Id: Ic850e779a04129fea4b371e54378c19ef0163fb2
| | * | Merge "Fix google-explicit-constructor warnings." am: 52197e3286Chih-Hung Hsieh2016-08-151-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | am: f04e5ddd4e Change-Id: Id47e82de445209d06ccdaec1eabaefe485ee9193
| | | * Merge "Fix google-explicit-constructor warnings."android-n-mr1-preview-2android-n-mr1-preview-1Chih-Hung Hsieh2016-08-151-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | am: 52197e3286 Change-Id: I33d1b176b711932deec9f1f2bf361477fa5bf0a1