summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-09-14Mark libscrypt_static as vendor_available am: 05c326f69f -s oursLogan Chien
am: a87f729dfa -s ours Change-Id: Ia75bb37a6943ce1639138b1aad366ce563b1b23b
2017-09-14Convert Android.mk to Android.bp am: 0ab01106aa -s oursLogan Chien
am: a4ae88a0a0 -s ours Change-Id: I72c5657e66816f578da4347cf33314efb1c66cc7
2017-09-14Fix import_scrypt.sh am: 99a9876066 -s oursLogan Chien
am: 9df37cf822 -s ours Change-Id: I069cc36dcde12d5810d1bee896d38ac2259b1cef
2017-09-14Enable arm64 neon scrypt implementationLogan Chien
am: 58a2d19076 -s ours Change-Id: I78327987075c0d12166ca34d1a039f00e17fb364
2017-09-14Mark libscrypt_static as vendor_availableLogan Chien
am: 05c326f69f -s ours Change-Id: Ia1e341db5e0071e2dfa1f9590ec3105cd51429cf
2017-09-14Convert Android.mk to Android.bpLogan Chien
am: 0ab01106aa -s ours Change-Id: Idc91649f214e1ea9381c7af568f85e47735a50df
2017-09-14Fix import_scrypt.shLogan Chien
am: 99a9876066 -s ours Change-Id: Id066c16f6c9844ebaf2197c1c647d5d342e3b38c
2017-09-14Merge changes If40a3037,I06bcc80c,I8e901b0b,I843a2144 am: 0b06038e14 am: ↵Logan Chien
62f9d716cd am: c40aced863 am: c187a38651 Change-Id: Iffd56dd83d43ac9822f76346732bc41d84c80d95
2017-09-13Merge changes If40a3037,I06bcc80c,I8e901b0b,I843a2144 am: 0b06038e14 am: ↵Logan Chien
62f9d716cd am: c40aced863 Change-Id: Id3ed659a318b0e319f47588c8b16eae00bff4cee
2017-09-13Merge changes If40a3037,I06bcc80c,I8e901b0b,I843a2144 am: 0b06038e14Logan Chien
am: 62f9d716cd Change-Id: Iabf20beb5b064826ca28ac11d5a2bf9a39ad3e6f
2017-09-13Merge changes If40a3037,I06bcc80c,I8e901b0b,I843a2144Logan Chien
am: 0b06038e14 Change-Id: If19509c6c81b2e57c7e51f838390de150998ff29
2017-09-13Merge changes If40a3037,I06bcc80c,I8e901b0b,I843a2144Logan Chien
* changes: Enable arm64 neon scrypt implementation Mark libscrypt_static as vendor_available Convert Android.mk to Android.bp Fix import_scrypt.sh
2017-09-12Enable arm64 neon scrypt implementationoreo-mr1-devLogan Chien
It seems that old Scrypt-config.mk is unaware of arm64 architecture. In fact, crypto_scrypt-neon.c can be compiled into arm64 as well. This CL adds an arch section for arm64. Bug: 65425184 Test: adb shell /data/nativetest64/scrypt_test/scrypt_test Change-Id: Ib451de642c7cc4548bfdc0879781981654b21b8f Merged-In: If40a30378b8038324aad44071107130d7722e28d
2017-09-12Mark libscrypt_static as vendor_availableLogan Chien
This commit marks libscrypt_static as vendor_available so that vendor modules can depend on libscrypt_static. Bug: 65425184 Test: BOARD_VNDK_VERSION=current mm -j8 Change-Id: I98a99b09b5bf28814ce294337aff97d7bbc837a0 Merged-In: I06bcc80cb71c60d75bf15873632042e72bf3f57c
2017-09-12Convert Android.mk to Android.bpLogan Chien
This commit converts Android.mk, android-config.mk, Scrypt.mk, and Scrypt-config.mk files to an Android.bp file. If BOARD_VNDK_VERSION is set to current, vendor modules won't be allowed to link libscrypt_static. To make libscrypt_static available to vendor modules, we have to set vendor_available to true. However, vendor_available is an Android.bp feature, thus we have to convert Android.mk to Android.bp first. Bug: 65425184 Test: mm -j8 && adb sync && adb shell /data/nativetest/scrypt_test/scrypt_test Test: mm -j8 && adb sync && \ adb shell /data/nativetest64/scrypt_test/scrypt_test Change-Id: I5f4c574c0ebb00eca4a52ad230dedc4ac05ff711 Merged-In: I8e901b0b1bec172d5e57f529ca76eae1c57def6a
2017-09-12Fix import_scrypt.shLogan Chien
This commit fixes various issues in import_scrypt.sh: * Add `-N` option to `diff` command so that arm_neon.diff can be generated by import_scrypt.sh * Rename SCRYPT_PATCHES_bionic_SOURCES to SCRYPT_PATCHES_arm_neon_SOURCES * Reorder SCRYPT_PATCHES_arm_neon_SOURCES to mimic git-diff output * Add missing `lib/crypto/crypto_scrypt-sse.c` file for use_openssl_pbkdf2.patch * Add `-f` to `rm` command in the `generate` command because `config.h` is not in the upstream release tarball * Replace typo `$SCRYPT_DIR_ORIG_ORIG` with `$SCRYPT_DIR_ORIG` * Rename arm-neon.patch to arm_neon.patch (for consistency) Bug: 65425184 Test: ./import_scrypt.sh import upstream/scrypt-1.1.6.tgz Test: ./import_scrypt.sh generate patches/arm_neon.patch \ upstream/scrypt-1.1.6.tgz Test: ./import_scrypt.sh generate patches/use_openssl_pbkdf2.patch \ upstream/scrypt-1.1.6.tgz Change-Id: I56d912313e35c1127e18b49cff0b429837b08e77 Merged-In: I843a21440527ed4037525468e9f66630f24b4cee
2017-09-12Enable arm64 neon scrypt implementationLogan Chien
It seems that old Scrypt-config.mk is unaware of arm64 architecture. In fact, crypto_scrypt-neon.c can be compiled into arm64 as well. This CL adds an arch section for arm64. Bug: 65425184 Test: adb shell /data/nativetest64/scrypt_test/scrypt_test Change-Id: If40a30378b8038324aad44071107130d7722e28d
2017-09-12Mark libscrypt_static as vendor_availableLogan Chien
This commit marks libscrypt_static as vendor_available so that vendor modules can depend on libscrypt_static. Bug: 65425184 Test: BOARD_VNDK_VERSION=current mm -j8 Change-Id: I06bcc80cb71c60d75bf15873632042e72bf3f57c
2017-09-12Convert Android.mk to Android.bpLogan Chien
This commit converts Android.mk, android-config.mk, Scrypt.mk, and Scrypt-config.mk files to an Android.bp file. If BOARD_VNDK_VERSION is set to current, vendor modules won't be allowed to link libscrypt_static. To make libscrypt_static available to vendor modules, we have to set vendor_available to true. However, vendor_available is an Android.bp feature, thus we have to convert Android.mk to Android.bp first. Bug: 65425184 Test: mm -j8 && adb sync && adb shell /data/nativetest/scrypt_test/scrypt_test Test: mm -j8 && adb sync && \ adb shell /data/nativetest64/scrypt_test/scrypt_test Change-Id: I8e901b0b1bec172d5e57f529ca76eae1c57def6a
2017-09-12Fix import_scrypt.shLogan Chien
This commit fixes various issues in import_scrypt.sh: * Add `-N` option to `diff` command so that arm_neon.diff can be generated by import_scrypt.sh * Rename SCRYPT_PATCHES_bionic_SOURCES to SCRYPT_PATCHES_arm_neon_SOURCES * Reorder SCRYPT_PATCHES_arm_neon_SOURCES to mimic git-diff output * Add missing `lib/crypto/crypto_scrypt-sse.c` file for use_openssl_pbkdf2.patch * Add `-f` to `rm` command in the `generate` command because `config.h` is not in the upstream release tarball * Replace typo `$SCRYPT_DIR_ORIG_ORIG` with `$SCRYPT_DIR_ORIG` * Rename arm-neon.patch to arm_neon.patch (for consistency) Bug: 65425184 Test: ./import_scrypt.sh import upstream/scrypt-1.1.6.tgz Test: ./import_scrypt.sh generate patches/arm_neon.patch \ upstream/scrypt-1.1.6.tgz Test: ./import_scrypt.sh generate patches/use_openssl_pbkdf2.patch \ upstream/scrypt-1.1.6.tgz Change-Id: I843a21440527ed4037525468e9f66630f24b4cee
2017-07-19Merge "external/scrypt: use proper nativehelper headers" am: a1026771cc am: ↵Steven Moreland
581021037c am: ffa1823922 am: 9af45b8544 Change-Id: I1855c2a0f3e948ae88309dc510aab345586a539b
2017-07-19Merge "external/scrypt: use proper nativehelper headers" am: a1026771cc am: ↵Steven Moreland
581021037c am: ffa1823922 Change-Id: Idf17477f118123e63776cd267b57f4806772008a
2017-07-19Merge "external/scrypt: use proper nativehelper headers" am: a1026771ccSteven Moreland
am: 581021037c Change-Id: Iadb6fc6102e2e03fdc88875f45a130d488c18b9b
2017-07-19Merge "external/scrypt: use proper nativehelper headers"android-o-mr1-preview-2android-o-mr1-preview-1Steven Moreland
am: a1026771cc Change-Id: Ic67ebd42bf2aa2ea81a52d013241baea333136aa
2017-07-19Merge "external/scrypt: use proper nativehelper headers"android-o-iot-preview-5o-iot-preview-5Treehugger Robot
2017-07-18external/scrypt: use proper nativehelper headersSteven Moreland
libnativeheader exports headers under nativeheader. These were available before incorrectly as global headers in order to give access to jni.h. Test: modules using external/scrypt find headers Bug: 63762847 Change-Id: I9baf896015a1920f8a26daa2a0c549169628890f
2017-06-16Merge "Add OWNERS in external/scrypt" am: b7477d8eed am: e236788532 am: ↵Chih-hung Hsieh
a0a2dc382e am: 28f5f2d2a3 Change-Id: Ia3d87eabbdce6b5ca695c1ccf85fdf42ae887c4e
2017-06-16Merge "Add OWNERS in external/scrypt" am: b7477d8eed am: e236788532Chih-hung Hsieh
am: a0a2dc382e Change-Id: I3c42d68505db6adcbf6aef205c2e3cbdef6bb8cd
2017-06-16Merge "Add OWNERS in external/scrypt" am: b7477d8eedChih-hung Hsieh
am: e236788532 Change-Id: I660b36c7e5cbc4534a89cabf430a588397c8e786
2017-06-16Merge "Add OWNERS in external/scrypt"Chih-hung Hsieh
am: b7477d8eed Change-Id: Ifdd24e0a245e69ba381ec28f678f84fb8babff0f
2017-06-16Merge "Add OWNERS in external/scrypt"android-o-preview-4Chih-hung Hsieh
2017-06-15Add OWNERS in external/scryptChih-Hung Hsieh
* Owners are selected from top CL approvals or owners. They will be suggested to review/approve future CLs. * OWNERS files are recognized by the new find-owners plugin, see .md files in https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/ Test: build/make/tools/checkowners.py -c -v OWNERS Change-Id: I41d1076af8926ae570cffd7f3341a4c76f2dc196
2016-07-23Merge \\\\"Rename lib{crypto,ssl}-host to lib{crypto,ssl}\\\\" am: ↵android-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-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-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_r26android-cts-8.0_r25android-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_r51android-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_r34android-8.0.0_r33android-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_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-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-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-releaseDan Willemsen
4b2bd9665c am: b442b13773 am: 32be729d37 am: 99611dfb9a Change-Id: I6336d3574bef526024a7ce10cf4e736565d9dd51
2016-07-23Merge \\\"Rename lib{crypto,ssl}-host to lib{crypto,ssl}\\\" am: 4b2bd9665c ↵android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1android-n-iot-preview-4o-previewn-iot-preview-4Dan Willemsen
am: b442b13773 am: 32be729d37 Change-Id: I13fec30c977a102b14e94b326ee292a64f79a17f
2016-07-23Merge \\"Rename lib{crypto,ssl}-host to lib{crypto,ssl}\\" am: 4b2bd9665cDan Willemsen
am: b442b13773 Change-Id: I1b431113bfa436546c18f4bd361766ec237274d4
2016-07-23Merge \"Rename lib{crypto,ssl}-host to lib{crypto,ssl}\"android-n-mr1-preview-2android-n-mr1-preview-1Dan Willemsen
am: 4b2bd9665c Change-Id: Icd4ce38a012e91a709de21b1c377c580cdc12599
2016-07-23Merge "Rename lib{crypto,ssl}-host to lib{crypto,ssl}"Dan Willemsen
2016-07-21Rename lib{crypto,ssl}-host to lib{crypto,ssl}Dan Willemsen
There's no need to use a different name for target and host moudles. In Soong, it's better to use the same for both, as target and host modules can be defined at the same time. Change-Id: I47f356b4fdde5b3a0b75862b1e9d91723ca06f27
2016-05-17Merge "scrypt doesn\'t need <machine/cpu-features.h>." am: e6e09c358c am: ↵Elliott Hughes
3608597959 am: 540c0274be am: e078c5e5f6 * commit 'e078c5e5f609e3441212c6b00e038fc014cc6daa': scrypt doesn't need <machine/cpu-features.h>. Change-Id: I3c54d96e44eccd15413831bdaef63a879d6d8dd6
2016-05-17Merge "scrypt doesn\'t need <machine/cpu-features.h>." am: e6e09c358c am: ↵Elliott Hughes
3608597959 am: 540c0274be * commit '540c0274bedb28050223c305f9a5499b06df328e': scrypt doesn't need <machine/cpu-features.h>. Change-Id: I6242ca18c85c3cd98b9f4a558d54f934c6c5409b
2016-05-17Merge "scrypt doesn\'t need <machine/cpu-features.h>." am: e6e09c358cElliott Hughes
am: 3608597959 * commit '36085979592293853cb18fadb61358f5b7f4f717': scrypt doesn't need <machine/cpu-features.h>. Change-Id: I724c161acbb6b2caa6ba9d438c1325e95ad4b830
2016-05-17Merge "scrypt doesn\'t need <machine/cpu-features.h>."Elliott Hughes
am: e6e09c358c * commit 'e6e09c358c249191cf3afa0e44db95b45ea332c4': scrypt doesn't need <machine/cpu-features.h>. Change-Id: Ia87611af260d74930786c044475da06928ab5d6b
2016-05-17Merge "scrypt doesn't need <machine/cpu-features.h>."android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Elliott Hughes
2016-05-17scrypt doesn't need <machine/cpu-features.h>.Elliott Hughes
Bug: http://b/18556103 Change-Id: Ibccef334b4d1a2e68e327fc8b73e62e62d13df32
2016-03-03Merge "Don't hardcode gtest path."android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3android-n-preview-2android-n-preview-1Dan Albert
2016-03-03Don't hardcode gtest path.Dan Albert
Bug: http://b/16574165 Change-Id: Ieb63fb6a73f0fb2ab3260bc5eabca7d86d892fbd
2015-01-30Merge "Remove OpenSSL include paths."android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-releasemaster-soongmarshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseKenny Root
2015-01-22Remove OpenSSL include paths.Adam Langley
The libcrypto and libssl modules (and their respective static and host versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module is sufficient. Change-Id: I1bc36094ecbc4ed2d9a4c62498f05580770f4a8a
2014-11-05Merge "Don't explicitly link gtest."android-wear-5.0.0_r1lollipop-wear-releaseDan Albert
2014-11-04Don't explicitly link gtest.Dan Albert
The build system does this for us. Since libgtest is the stlport version of the library, this causes build breakages when libc++ is the default STL. Bug: 15193147 Change-Id: Ief6f539de36f38d38bd1460b17efcdc09114d64d
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 12:08:55 +0000