summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: e35afdb142 -s ours am: abc7e18c9f -s ours am: 99bb8c3a50 -s ours Change-Id: Id805e908de64c29c49a179c2c2b7a06e121dbaa2
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: e35afdb142 -s ours am: abc7e18c9f -s ours Change-Id: I6f7ae9e7868ba838e5047af468a67b6c9fd7cbee
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: e35afdb142 -s ours Change-Id: I15d720902957d89ad2fd7833de97d19e63549fb8
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-n-iot-release-ihome-igv1oreo-mr1-iot-releasenougat-iot-releaseBill Yi
Change-Id: If2228649d0d5f48fb3abc9868b64bc0983a70311
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 76d6a4333e -s ours am: 512c3dc467 -s ours Change-Id: I61d3c9f125394064e2953bf0b4d68085e19501f8
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 76d6a4333e -s ours Change-Id: I1efc8f292ea59c1f0ed6a480dae2234aa43d3047
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I80ac8293968d0bb3673b82143760093c08532cd5
2018-05-08Merge "Do not warn about ignored warnings" am: fff93d76c6 am: 1465941e66Yi Kong
am: c37a330865 Change-Id: I8766550a9af995882d6320e33ce54a4436240143
2018-05-08Merge "Do not warn about ignored warnings" am: fff93d76c6android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseYi Kong
am: 1465941e66 Change-Id: Ib7df7f7e708a82451418461fa27709a8f175c640
2018-05-08Merge "Do not warn about ignored warnings"Yi Kong
am: fff93d76c6 Change-Id: I91fbd09082bbabd24ee4d2eb03f090e9075859ee
2018-05-08Merge "Do not warn about ignored warnings"android-p-preview-5android-p-preview-4android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1Yi Kong
2018-04-25Do not warn about ignored warningsYi Kong
Change warning level from Wno-error to Wno, since we ignore these warnings in external projects. Test: m Change-Id: Iffedaca0d2f83a186d10fdcd87045a1a98cdc701
2018-04-03Merge "Update the SDK version of Scrypt" am: 46c951675d am: 8c65f360e1George Burgess IV
am: fa7dff185f Change-Id: I097485dfe715be46a258acc3f1a583c5f5f950ea
2018-04-03Merge "Update the SDK version of Scrypt" am: 46c951675dGeorge Burgess IV
am: 8c65f360e1 Change-Id: I849b9add549eb3014439fd043deee2c0d05f5bc1
2018-04-03Merge "Update the SDK version of Scrypt"George Burgess IV
am: 46c951675d Change-Id: I43ef0f429f77dc680be7dcd4cb9404ff414afd55
2018-04-04Merge "Update the SDK version of Scrypt"android-wear-p-preview-2android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8Treehugger Robot
2018-04-03Update the SDK version of ScryptGeorge Burgess IV
It's relying on posix_memalign, which is only available as of SDK version 17 (the ndk headers say 16, but I'm told that's a bug that'll be fixed soon). Originally complained about by the static analyzer (and, presumably, clang): external/scrypt/lib/crypto/crypto_scrypt-neon.c:228:15: warning: implicit declaration of function 'posix_memalign' is invalid in C99 [-Wimplicit-function-declaration] Bug: None Test: Builds on internal master without complaining about posix_memalign being implicitly declared. Change-Id: I5d9ecd79e0fb2372c92076bbf86e334132fb088f
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 14:41:01 +0000