summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-10-03Snap for 4373608 from 99dba2d5b0499fd2c8f8ae9d5cf4583a8ac824b8 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: If5d09813bb0c734ce03e5515c0b81c6d74d98794
2017-10-02Merge "Scrypt: remove unused include" am: 9737bb84c9 am: d95a0100c0 am: ↵android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devAndreas Gampe
ee712e7ad6 am: 652cdbe912 Change-Id: I6f5f8e83553ea16ba077869a9143123f26c8e849
2017-10-02Merge "Scrypt: remove unused include" am: 9737bb84c9 am: d95a0100c0android-wear-8.0.0_r1android-p-preview-1android-o-mr1-iot-preview-7o-mr1-iot-preview-7Andreas Gampe
am: ee712e7ad6 Change-Id: Ied30aeb844a817f12bb22d333ba74a44e16b0279
2017-10-02Merge "Scrypt: remove unused include" am: 9737bb84c9Andreas Gampe
am: d95a0100c0 Change-Id: Id5d97e1a517c35799e1ba115745258116cef1963
2017-10-02Merge "Scrypt: remove unused include"android-o-mr1-iot-preview-6o-mr1-iot-preview-6Andreas Gampe
am: 9737bb84c9 Change-Id: I04781fd8cdb53a53c136df735f0811cb3cea3096
2017-10-02Merge "Scrypt: remove unused include"Treehugger Robot
2017-10-02Scrypt: remove unused includeAndreas Gampe
In preparation for removal. Test: mmma external/scrypt Change-Id: Id2b8525a93cfad74ce8c82e1e2244d1a64a24f4f
2017-09-30release-request-b4bc7b84-64b6-4176-8f16-ce17068fad13-for-git_pi-release-4370 ↵android-build-team Robot
135 snap-temp-L93500000107644030 Change-Id: I04e1e5751870767f4abe215c453edd30f802a549
2017-09-29Merge "Use -Werror in external/scrypt" am: bcc2d0c8ec am: 1ef1ce7c0e am: ↵Chih-Hung Hsieh
9b1807ba4f am: 39f767da28 Change-Id: I567257ab15938696a937de62a3d190d37a12f1c8
2017-09-29Merge "Use -Werror in external/scrypt" am: bcc2d0c8ec am: 1ef1ce7c0eChih-Hung Hsieh
am: 9b1807ba4f Change-Id: I46ba02355d43658274c97adb530b63f9794269ee
2017-09-29Merge "Use -Werror in external/scrypt" am: bcc2d0c8ecChih-Hung Hsieh
am: 1ef1ce7c0e Change-Id: Ib4f1b0c940c55ef5c71fba87fd7afc76eab3778a
2017-09-29Merge "Use -Werror in external/scrypt"Chih-Hung Hsieh
am: bcc2d0c8ec Change-Id: I2420e788dd4515a99e7fcdf7af3b36525f4ac6bd
2017-09-29Merge "Use -Werror in external/scrypt"Treehugger Robot
2017-09-29Use -Werror in external/scryptChih-Hung Hsieh
* Use -Wno-error= to Keep existing warnings to fix later. Bug: 66996870 Test: build with WITH_TIDY=1 Change-Id: I8b9847aaceaa223b34391ac94ac35924af9caccc
2017-09-14release-request-b06579bd-a905-4db5-ada9-c69d40f4df90-for-git_pi-release-4335 ↵android-build-team Robot
309 snap-temp-L62700000102430107 Change-Id: I3082b49c8e930ff568dc999d6a11806ec74705d5
2017-09-14Enable arm64 neon scrypt implementation am: 58a2d19076 -s oursLogan Chien
am: dfe429ef25 -s ours Change-Id: If3051947fb0768b503802f648542b9ad2949b35f
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 10:33:12 +0000