)]}' { "log": [ { "commit": "ce9589686c1e6de5ec85e7f4da3b072e401f2e62", "tree": "305384d40940cc8308d1cd3538e07cc0bba53abf", "parents": [ "ddf5ab5ec9cb553111f65854f91d158512f99065", "879d4e78d617270d5e9402fdd0a0ccfd98ac2eac" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 20 13:39:42 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 20 13:39:42 2024 -0800" }, "message": "Empty merge ab/12770256 into aosp-main-future\n\nMerged-In: Ic023cc45a0bba4fcbaf234aa2017c27b25cf1e74\nChange-Id: Ia869e09f39850e6f7b14e449ff8abcbca49f6a9d\n" }, { "commit": "ddf5ab5ec9cb553111f65854f91d158512f99065", "tree": "305384d40940cc8308d1cd3538e07cc0bba53abf", "parents": [ "f3d0d892bab51851300ad301488746321a1391da", "a002d63d04451568c519ce66cbca5c73e74bb60a" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Dec 19 06:59:48 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 19 06:59:48 2024 -0800" }, "message": "Merge \"Add janitors to the OWNERS file\" into main am: a002d63d04\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/scrypt/+/3424004\n\nChange-Id: Ibb49bed66c94e2f470b719db7470ce750d5932e1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a002d63d04451568c519ce66cbca5c73e74bb60a", "tree": "305384d40940cc8308d1cd3538e07cc0bba53abf", "parents": [ "f3d0d892bab51851300ad301488746321a1391da", "415b4ded20ad974737446a1ab7daba7ee5422426" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Dec 19 06:27:39 2024 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Dec 19 06:27:39 2024 -0800" }, "message": "Merge \"Add janitors to the OWNERS file\" into main" }, { "commit": "415b4ded20ad974737446a1ab7daba7ee5422426", "tree": "305384d40940cc8308d1cd3538e07cc0bba53abf", "parents": [ "f3d0d892bab51851300ad301488746321a1391da" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Wed Dec 18 20:37:29 2024 +0000" }, "committer": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Wed Dec 18 20:37:29 2024 +0000" }, "message": "Add janitors to the OWNERS file\n\nTest: TreeHugger\nChange-Id: I0352184cd7138c925c0edd3a7384e7bd4a968042\n" }, { "commit": "879d4e78d617270d5e9402fdd0a0ccfd98ac2eac", "tree": "2f913f6b79b278776586f451918375faef952ea3", "parents": [ "edaa5bf0b024fc548f88dbf37e4963ed5e5c4db4", "f3d0d892bab51851300ad301488746321a1391da" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Nov 20 14:04:29 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 20 14:04:29 2024 +0000" }, "message": "Merge \"Remove unused -Wno-implicit-function-declaration.\" into main am: 6df5362aff am: f3d0d892ba\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/scrypt/+/3357118\n\nChange-Id: I71e7cf983a883b00775962062fbf0d07d102696f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f3d0d892bab51851300ad301488746321a1391da", "tree": "2f913f6b79b278776586f451918375faef952ea3", "parents": [ "edaa5bf0b024fc548f88dbf37e4963ed5e5c4db4", "6df5362affb92a491d7bd0e465f97b8a47949b31" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Nov 20 13:41:06 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 20 13:41:06 2024 +0000" }, "message": "Merge \"Remove unused -Wno-implicit-function-declaration.\" into main am: 6df5362aff\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/scrypt/+/3357118\n\nChange-Id: I50e6c99b5a4f92b6a63abea7b4e995e3e2f40cce\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6df5362affb92a491d7bd0e465f97b8a47949b31", "tree": "2f913f6b79b278776586f451918375faef952ea3", "parents": [ "edaa5bf0b024fc548f88dbf37e4963ed5e5c4db4", "8b6d17f6a768686272c7fce2fd26b0a454177f9f" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Nov 20 13:18:10 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Nov 20 13:18:10 2024 +0000" }, "message": "Merge \"Remove unused -Wno-implicit-function-declaration.\" into main" }, { "commit": "8b6d17f6a768686272c7fce2fd26b0a454177f9f", "tree": "2f913f6b79b278776586f451918375faef952ea3", "parents": [ "edaa5bf0b024fc548f88dbf37e4963ed5e5c4db4" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Nov 15 20:50:17 2024 +0000" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Nov 15 20:50:17 2024 +0000" }, "message": "Remove unused -Wno-implicit-function-declaration.\n\nThis is becoming an error in C23 anyway.\n\nChange-Id: Ib976e1f727025a52c5465ad3166d4f5364ad1f4c\n" }, { "commit": "edaa5bf0b024fc548f88dbf37e4963ed5e5c4db4", "tree": "6948d90e4474001ecca6892f565b9618d8764d5a", "parents": [ "c6cbacee7e128674e7e2ed0ed83589bf3ef5e1e9", "ecfcdeca962bc438f1e3a429d02f1ef3e8ff27ff" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Apr 25 15:10:45 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 25 15:10:45 2024 +0000" }, "message": "Merge \"Remove unnecessary `neon:`.\" into main am: 2eee6f12bc am: ecfcdeca96\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/scrypt/+/3047132\n\nChange-Id: I9957db7d2b04fa56427d0beffe7d3e422ad63ce6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ecfcdeca962bc438f1e3a429d02f1ef3e8ff27ff", "tree": "6948d90e4474001ecca6892f565b9618d8764d5a", "parents": [ "c6cbacee7e128674e7e2ed0ed83589bf3ef5e1e9", "2eee6f12bcbb89158d6dd70fd35bf034f047489f" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Apr 25 14:51:47 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 25 14:51:47 2024 +0000" }, "message": "Merge \"Remove unnecessary `neon:`.\" into main am: 2eee6f12bc\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/scrypt/+/3047132\n\nChange-Id: I8432ba24bc9b51c7c7855522d48e835c827a773e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2eee6f12bcbb89158d6dd70fd35bf034f047489f", "tree": "6948d90e4474001ecca6892f565b9618d8764d5a", "parents": [ "c6cbacee7e128674e7e2ed0ed83589bf3ef5e1e9", "f5467d9c4ab71065f25adadee1ac311cab5b3da3" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Apr 25 14:15:49 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Apr 25 14:15:49 2024 +0000" }, "message": "Merge \"Remove unnecessary `neon:`.\" into main" }, { "commit": "f5467d9c4ab71065f25adadee1ac311cab5b3da3", "tree": "6948d90e4474001ecca6892f565b9618d8764d5a", "parents": [ "c6cbacee7e128674e7e2ed0ed83589bf3ef5e1e9" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Apr 17 17:41:53 2024 +0000" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Apr 17 17:41:53 2024 +0000" }, "message": "Remove unnecessary `neon:`.\n\nThis has been hard-coded on for years now, and is due to be removed.\n\nChange-Id: I0ab1c91c37d82c748d9fc0eab201df509feb835c\n" }, { "commit": "c6cbacee7e128674e7e2ed0ed83589bf3ef5e1e9", "tree": "dc6c42b0486a718499f44207bac0580ff6964c26", "parents": [ "c3a5fc0e91d7b9cd3de426eef8d4ba17eac14eb7", "c9bce8a96abc9f1234e005a0f45f3e99f0b00f83" ], "author": { "name": "Oystein Eftevaag", "email": "oysteine@google.com", "time": "Sat Feb 11 01:55:20 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 11 01:55:20 2023 +0000" }, "message": "Merge \"Enable Windows host compilation of scrypt\" am: c09f61a395 am: 4c2a09a3c8 am: c9bce8a96a\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/scrypt/+/2414316\n\nChange-Id: I50a66b0600741b9e6522abe2faca5fd7806a405e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c9bce8a96abc9f1234e005a0f45f3e99f0b00f83", "tree": "dc6c42b0486a718499f44207bac0580ff6964c26", "parents": [ "c3a5fc0e91d7b9cd3de426eef8d4ba17eac14eb7", "4c2a09a3c8f8d120c0016cc51bbce773a6b30f32" ], "author": { "name": "Oystein Eftevaag", "email": "oysteine@google.com", "time": "Sat Feb 11 00:04:07 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 11 00:04:07 2023 +0000" }, "message": "Merge \"Enable Windows host compilation of scrypt\" am: c09f61a395 am: 4c2a09a3c8\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/scrypt/+/2414316\n\nChange-Id: I2856ad848cfc32c6760b58026bd2ebd941e1a506\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4c2a09a3c8f8d120c0016cc51bbce773a6b30f32", "tree": "dc6c42b0486a718499f44207bac0580ff6964c26", "parents": [ "c3a5fc0e91d7b9cd3de426eef8d4ba17eac14eb7", "c09f61a395931b109c2a15409b285a7b801c2a68" ], "author": { "name": "Oystein Eftevaag", "email": "oysteine@google.com", "time": "Fri Feb 10 22:25:08 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 10 22:25:08 2023 +0000" }, "message": "Merge \"Enable Windows host compilation of scrypt\" am: c09f61a395\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/scrypt/+/2414316\n\nChange-Id: If5a70264b8a8814eaa13e349fa09cfe71802d160\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c09f61a395931b109c2a15409b285a7b801c2a68", "tree": "dc6c42b0486a718499f44207bac0580ff6964c26", "parents": [ "c3a5fc0e91d7b9cd3de426eef8d4ba17eac14eb7", "803fb345757447daba274b7398cf25384eb39867" ], "author": { "name": "Oystein Eftevaag", "email": "oysteine@google.com", "time": "Fri Feb 10 20:36:54 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Feb 10 20:36:54 2023 +0000" }, "message": "Merge \"Enable Windows host compilation of scrypt\"" }, { "commit": "803fb345757447daba274b7398cf25384eb39867", "tree": "dc6c42b0486a718499f44207bac0580ff6964c26", "parents": [ "c3a5fc0e91d7b9cd3de426eef8d4ba17eac14eb7" ], "author": { "name": "Oystein Eftevaag", "email": "oysteine@google.com", "time": "Wed Feb 01 23:52:33 2023 +0000" }, "committer": { "name": "Oystein Eftevaag", "email": "oysteine@google.com", "time": "Thu Feb 02 17:54:59 2023 +0000" }, "message": "Enable Windows host compilation of scrypt\n\nBug: 261908998\nTest: scrypt builds using MinGW\nIGNORE_COMPLIANCELINT\u003dLicenseExists: Supporting new platform for existing package\nChange-Id: Id4939e062750cf0491f110f09e91757495c6e347\n" }, { "commit": "c3a5fc0e91d7b9cd3de426eef8d4ba17eac14eb7", "tree": "ef6e754701f052db4d354a169fb0de14fd8d1bd0", "parents": [ "56902b9f4bc6a9f6056dd8765621e5450417c0c1", "a301a787160f06157a2276dc1b32ffe7d65210f8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 02 16:50:57 2021 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 02 16:50:57 2021 +0000" }, "message": "Merge sc-mainline-prod\n\nBug: 189946434\nChange-Id: I4f9e75fb308e44b53e3c56d8a24adfaf61d431fc\n" }, { "commit": "56902b9f4bc6a9f6056dd8765621e5450417c0c1", "tree": "ef6e754701f052db4d354a169fb0de14fd8d1bd0", "parents": [ "73cfcf71ca2d00debde21c63edaf4fdb96e32143", "c91d67126471be75259170daaf9930900222d610" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 05 23:17:47 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 05 23:17:47 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/scrypt\" am: bad7e59471 am: 3d08789812 am: bef041db90 am: c91d671264\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/scrypt/+/1576025\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Idb51f4c791e396b6b646fcf2aa93c5f7fcf0c053\n" }, { "commit": "a301a787160f06157a2276dc1b32ffe7d65210f8", "tree": "ef6e754701f052db4d354a169fb0de14fd8d1bd0", "parents": [ "73cfcf71ca2d00debde21c63edaf4fdb96e32143", "c91d67126471be75259170daaf9930900222d610" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 05 23:17:04 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 05 23:17:04 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/scrypt\" am: bad7e59471 am: 3d08789812 am: bef041db90 am: c91d671264\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/scrypt/+/1576025\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ida48f48b5b976bab4eb06eb0d49d480eeab76d7e\n" }, { "commit": "c91d67126471be75259170daaf9930900222d610", "tree": "ef6e754701f052db4d354a169fb0de14fd8d1bd0", "parents": [ "73cfcf71ca2d00debde21c63edaf4fdb96e32143", "bef041db902120ad4ee469564b7780cff8b91d44" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 05 22:26:24 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 05 22:26:24 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/scrypt\" am: bad7e59471 am: 3d08789812 am: bef041db90\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/scrypt/+/1576025\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: If1f1486b311d2ae97c5418ae46dbed4da91a1573\n" }, { "commit": "bef041db902120ad4ee469564b7780cff8b91d44", "tree": "ef6e754701f052db4d354a169fb0de14fd8d1bd0", "parents": [ "dabd9d99c63ce5cbca4c8a0487034bab4f173ee6", "3d08789812da12a03f6fb916420f05f39cc9903d" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 05 21:55:12 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 05 21:55:12 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/scrypt\" am: bad7e59471 am: 3d08789812\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/scrypt/+/1576025\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Id6fcb6a172854e04a72015080c63906651ae106c\n" }, { "commit": "3d08789812da12a03f6fb916420f05f39cc9903d", "tree": "ef6e754701f052db4d354a169fb0de14fd8d1bd0", "parents": [ "dabd9d99c63ce5cbca4c8a0487034bab4f173ee6", "bad7e594711926da1cf9011644339e2369c68ac8" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 05 21:34:46 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 05 21:34:46 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/scrypt\" am: bad7e59471\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/scrypt/+/1576025\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I3229d9ccba223c94e59b02441dbe0a4f007c40e5\n" }, { "commit": "bad7e594711926da1cf9011644339e2369c68ac8", "tree": "ef6e754701f052db4d354a169fb0de14fd8d1bd0", "parents": [ "dabd9d99c63ce5cbca4c8a0487034bab4f173ee6", "8d9a7b121dd2f9e1372b33c1aea48ec412fa7dd7" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 05 20:53:59 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Feb 05 20:53:59 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to external/scrypt\"" }, { "commit": "8d9a7b121dd2f9e1372b33c1aea48ec412fa7dd7", "tree": "ef6e754701f052db4d354a169fb0de14fd8d1bd0", "parents": [ "dabd9d99c63ce5cbca4c8a0487034bab4f173ee6" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Wed Feb 03 20:57:35 2021 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 05 01:27:41 2021 -0800" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/scrypt\n\nAdded SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:\n Android.bp\n\nBug: 68860345\nBug: 151177513\nBug: 151953481\n\nTest: m all\n\nExempt-From-Owner-Approval: janitorial work\nChange-Id: Ibc40937e240da91ac40bcff896e0755a358ee5a5\n" }, { "commit": "73cfcf71ca2d00debde21c63edaf4fdb96e32143", "tree": "c11e17d8664e5a7ccc0862f3a191c58fc20e71db", "parents": [ "d6114db148b1ededd120de0cf2d1fc73ba1611ac", "dabd9d99c63ce5cbca4c8a0487034bab4f173ee6" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon May 04 20:22:27 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 04 20:22:27 2020 +0000" }, "message": "Merge \"Add METADATA to scrypt: Apache2+BSD\u003dNOTICE\" am: c284f76b4f am: 4436f99cac am: ce68324d6a am: 0d726f2747 am: dabd9d99c6\n\nChange-Id: I561f6b209de297bb29bc2ef2796e9d0e952389e7\n" }, { "commit": "dabd9d99c63ce5cbca4c8a0487034bab4f173ee6", "tree": "c11e17d8664e5a7ccc0862f3a191c58fc20e71db", "parents": [ "d6114db148b1ededd120de0cf2d1fc73ba1611ac", "0d726f274777a787bac06cb121b20956c17d85f4" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon May 04 20:07:58 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 04 20:07:58 2020 +0000" }, "message": "Merge \"Add METADATA to scrypt: Apache2+BSD\u003dNOTICE\" am: c284f76b4f am: 4436f99cac am: ce68324d6a am: 0d726f2747\n\nChange-Id: Ie8c9e3ffefa78ff470082147f125721032d948ca\n" }, { "commit": "0d726f274777a787bac06cb121b20956c17d85f4", "tree": "c11e17d8664e5a7ccc0862f3a191c58fc20e71db", "parents": [ "d6114db148b1ededd120de0cf2d1fc73ba1611ac", "ce68324d6a27fb1b0616ffd738a1bcccdf4ce93d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon May 04 19:45:45 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 04 19:45:45 2020 +0000" }, "message": "Merge \"Add METADATA to scrypt: Apache2+BSD\u003dNOTICE\" am: c284f76b4f am: 4436f99cac am: ce68324d6a\n\nChange-Id: I17bd572076fb2d24094589551021776b3be0da5f\n" }, { "commit": "ce68324d6a27fb1b0616ffd738a1bcccdf4ce93d", "tree": "c11e17d8664e5a7ccc0862f3a191c58fc20e71db", "parents": [ "d6114db148b1ededd120de0cf2d1fc73ba1611ac", "4436f99cac9d4626e465260e8aad6a0ff8aed2cf" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon May 04 19:33:25 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 04 19:33:25 2020 +0000" }, "message": "Merge \"Add METADATA to scrypt: Apache2+BSD\u003dNOTICE\" am: c284f76b4f am: 4436f99cac\n\nChange-Id: Ia9b64af4905d51ae181545f7d45fdd94bba76d0e\n" }, { "commit": "4436f99cac9d4626e465260e8aad6a0ff8aed2cf", "tree": "c11e17d8664e5a7ccc0862f3a191c58fc20e71db", "parents": [ "d6114db148b1ededd120de0cf2d1fc73ba1611ac", "c284f76b4f419e01b94e5974bde1fb1db5f78a1a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon May 04 19:19:37 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 04 19:19:37 2020 +0000" }, "message": "Merge \"Add METADATA to scrypt: Apache2+BSD\u003dNOTICE\" am: c284f76b4f\n\nChange-Id: I92ac92c311688efe9185a523d8b6425161396d75\n" }, { "commit": "c284f76b4f419e01b94e5974bde1fb1db5f78a1a", "tree": "c11e17d8664e5a7ccc0862f3a191c58fc20e71db", "parents": [ "d6114db148b1ededd120de0cf2d1fc73ba1611ac", "bded57982f7fa912afe246fe139393ab03008bbe" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon May 04 19:03:43 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon May 04 19:03:43 2020 +0000" }, "message": "Merge \"Add METADATA to scrypt: Apache2+BSD\u003dNOTICE\"" }, { "commit": "bded57982f7fa912afe246fe139393ab03008bbe", "tree": "c11e17d8664e5a7ccc0862f3a191c58fc20e71db", "parents": [ "d6114db148b1ededd120de0cf2d1fc73ba1611ac" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Apr 28 09:03:47 2020 -0700" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Apr 28 09:03:47 2020 -0700" }, "message": "Add METADATA to scrypt: Apache2+BSD\u003dNOTICE\n\nBug: 68860345\nBug: 69058154\nBug: 151953481\n\nTest: no code changes\nChange-Id: I6dacdfca306ed0e1bb35ab240789be2a6aeaee02\n" }, { "commit": "d6114db148b1ededd120de0cf2d1fc73ba1611ac", "tree": "6ddd82161b799040c3ff268a6df1b2afe034eb99", "parents": [ "8aee4d1c1c3bb2f22e29d1e6a31e890984cd20bf", "12c1e37a5ae989809158f3a035528c4a84ac9a76" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sun Feb 24 01:51:31 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Feb 24 01:51:31 2019 -0800" }, "message": "[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master\nam: 12c1e37a5a -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Ide2a89ad87ae37c55ef7792b16254b71eab4586b\n" }, { "commit": "12c1e37a5ae989809158f3a035528c4a84ac9a76", "tree": "6ddd82161b799040c3ff268a6df1b2afe034eb99", "parents": [ "abc7e18c9f216c9c04fdf55eaac130f12de5ef42", "99bb8c3a50990151c2e61cec1b3ea74ceaad723f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 20 16:18:56 2019 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 20 16:18:56 2019 -0800" }, "message": "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master\n\nBug: 120848293\nChange-Id: Id3ee9c6926ea715a0bd9743e1691f45ee1236a48\n" }, { "commit": "8aee4d1c1c3bb2f22e29d1e6a31e890984cd20bf", "tree": "6ddd82161b799040c3ff268a6df1b2afe034eb99", "parents": [ "36a7158db8f41f87b6600d06da5576f4cb52f87a", "99bb8c3a50990151c2e61cec1b3ea74ceaad723f" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 19:01:01 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 24 19:01:01 2018 -0700" }, "message": "[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: e35afdb142 -s ours am: abc7e18c9f -s ours\nam: 99bb8c3a50 -s ours\n\nChange-Id: Id805e908de64c29c49a179c2c2b7a06e121dbaa2\n" }, { "commit": "99bb8c3a50990151c2e61cec1b3ea74ceaad723f", "tree": "6ddd82161b799040c3ff268a6df1b2afe034eb99", "parents": [ "512c3dc467e395bcf0054177ff8d401af1fa2818", "abc7e18c9f216c9c04fdf55eaac130f12de5ef42" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 18:33:56 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 24 18:33:56 2018 -0700" }, "message": "[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: e35afdb142 -s ours\nam: abc7e18c9f -s ours\n\nChange-Id: I6f7ae9e7868ba838e5047af468a67b6c9fd7cbee\n" }, { "commit": "abc7e18c9f216c9c04fdf55eaac130f12de5ef42", "tree": "6ddd82161b799040c3ff268a6df1b2afe034eb99", "parents": [ "76d6a4333e02b16ef14823e12f2f0ba57afded56", "e35afdb1421a9834b4c7a9b5c55ffc1d0c2b4588" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 16:14:51 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 24 16:14:51 2018 -0700" }, "message": "[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE\nam: e35afdb142 -s ours\n\nChange-Id: I15d720902957d89ad2fd7833de97d19e63549fb8\n" }, { "commit": "e35afdb1421a9834b4c7a9b5c55ffc1d0c2b4588", "tree": "6ddd82161b799040c3ff268a6df1b2afe034eb99", "parents": [ "c37a330865ad150a993d2c610867312bb2a91e35", "1bcd68e1eb76f7ed62002d437f7c26cb1ab6c7dd" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 14:46:32 2018 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 14:46:32 2018 -0700" }, "message": "Merge pie-platform-release to aosp-master - DO NOT MERGE\n\nChange-Id: If2228649d0d5f48fb3abc9868b64bc0983a70311\n" }, { "commit": "36a7158db8f41f87b6600d06da5576f4cb52f87a", "tree": "6ddd82161b799040c3ff268a6df1b2afe034eb99", "parents": [ "04c9cc2f435afce6b2c27ad068f809c88f6d586d", "512c3dc467e395bcf0054177ff8d401af1fa2818" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 11:16:15 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 24 11:16:15 2018 -0700" }, "message": "[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 76d6a4333e -s ours\nam: 512c3dc467 -s ours\n\nChange-Id: I61d3c9f125394064e2953bf0b4d68085e19501f8\n" }, { "commit": "512c3dc467e395bcf0054177ff8d401af1fa2818", "tree": "6ddd82161b799040c3ff268a6df1b2afe034eb99", "parents": [ "c37a330865ad150a993d2c610867312bb2a91e35", "76d6a4333e02b16ef14823e12f2f0ba57afded56" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 10:58:30 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 24 10:58:30 2018 -0700" }, "message": "[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE\nam: 76d6a4333e -s ours\n\nChange-Id: I1efc8f292ea59c1f0ed6a480dae2234aa43d3047\n" }, { "commit": "76d6a4333e02b16ef14823e12f2f0ba57afded56", "tree": "6ddd82161b799040c3ff268a6df1b2afe034eb99", "parents": [ "c37a330865ad150a993d2c610867312bb2a91e35", "1bcd68e1eb76f7ed62002d437f7c26cb1ab6c7dd" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 09:06:18 2018 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Oct 24 09:06:18 2018 -0700" }, "message": "Merge pi-platform-release to stage-aosp-master - DO NOT MERGE\n\nChange-Id: I80ac8293968d0bb3673b82143760093c08532cd5\n" }, { "commit": "04c9cc2f435afce6b2c27ad068f809c88f6d586d", "tree": "6ddd82161b799040c3ff268a6df1b2afe034eb99", "parents": [ "35f244088c4f8e713dacf5916920f2cad2a6de44", "c37a330865ad150a993d2c610867312bb2a91e35" ], "author": { "name": "Yi Kong", "email": "yikong@google.com", "time": "Tue May 08 16:21:21 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 08 16:21:21 2018 -0700" }, "message": "Merge \"Do not warn about ignored warnings\" am: fff93d76c6 am: 1465941e66\nam: c37a330865\n\nChange-Id: I8766550a9af995882d6320e33ce54a4436240143\n" }, { "commit": "c37a330865ad150a993d2c610867312bb2a91e35", "tree": "6ddd82161b799040c3ff268a6df1b2afe034eb99", "parents": [ "fa7dff185f37fc59b8869c7cc55f4515e20da812", "1465941e66cd8167f959ebe72979180114c0cd1f" ], "author": { "name": "Yi Kong", "email": "yikong@google.com", "time": "Tue May 08 16:13:32 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 08 16:13:32 2018 -0700" }, "message": "Merge \"Do not warn about ignored warnings\" am: fff93d76c6\nam: 1465941e66\n\nChange-Id: Ib7df7f7e708a82451418461fa27709a8f175c640\n" }, { "commit": "1465941e66cd8167f959ebe72979180114c0cd1f", "tree": "6ddd82161b799040c3ff268a6df1b2afe034eb99", "parents": [ "8c65f360e19791c971f71c165bb22adc3ed11092", "fff93d76c6eb1c1fe9e8f7e675389efce3580b2a" ], "author": { "name": "Yi Kong", "email": "yikong@google.com", "time": "Tue May 08 16:08:36 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 08 16:08:36 2018 -0700" }, "message": "Merge \"Do not warn about ignored warnings\"\nam: fff93d76c6\n\nChange-Id: I91fbd09082bbabd24ee4d2eb03f090e9075859ee\n" }, { "commit": "fff93d76c6eb1c1fe9e8f7e675389efce3580b2a", "tree": "6ddd82161b799040c3ff268a6df1b2afe034eb99", "parents": [ "46c951675db25fd880bb97ef191108dd0746d13c", "bc248c0a022862e58e5d33e6d135f0de1757a263" ], "author": { "name": "Yi Kong", "email": "yikong@google.com", "time": "Tue May 08 23:00:27 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue May 08 23:00:27 2018 +0000" }, "message": "Merge \"Do not warn about ignored warnings\"" }, { "commit": "bc248c0a022862e58e5d33e6d135f0de1757a263", "tree": "6ddd82161b799040c3ff268a6df1b2afe034eb99", "parents": [ "46c951675db25fd880bb97ef191108dd0746d13c" ], "author": { "name": "Yi Kong", "email": "yikong@google.com", "time": "Wed Apr 25 20:58:11 2018 -0700" }, "committer": { "name": "Yi Kong", "email": "yikong@google.com", "time": "Wed Apr 25 20:58:11 2018 -0700" }, "message": "Do not warn about ignored warnings\n\nChange warning level from Wno-error to Wno, since we ignore these\nwarnings in external projects.\n\nTest: m\nChange-Id: Iffedaca0d2f83a186d10fdcd87045a1a98cdc701\n" }, { "commit": "35f244088c4f8e713dacf5916920f2cad2a6de44", "tree": "ec8f607b9f2d1512aa99796cf5954e5ddb2d2f24", "parents": [ "99dba2d5b0499fd2c8f8ae9d5cf4583a8ac824b8", "fa7dff185f37fc59b8869c7cc55f4515e20da812" ], "author": { "name": "George Burgess IV", "email": "gbiv@google.com", "time": "Tue Apr 03 18:27:14 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Apr 03 18:27:14 2018 -0700" }, "message": "Merge \"Update the SDK version of Scrypt\" am: 46c951675d am: 8c65f360e1\nam: fa7dff185f\n\nChange-Id: I097485dfe715be46a258acc3f1a583c5f5f950ea\n" }, { "commit": "fa7dff185f37fc59b8869c7cc55f4515e20da812", "tree": "ec8f607b9f2d1512aa99796cf5954e5ddb2d2f24", "parents": [ "99dba2d5b0499fd2c8f8ae9d5cf4583a8ac824b8", "8c65f360e19791c971f71c165bb22adc3ed11092" ], "author": { "name": "George Burgess IV", "email": "gbiv@google.com", "time": "Tue Apr 03 17:26:24 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Apr 03 17:26:24 2018 -0700" }, "message": "Merge \"Update the SDK version of Scrypt\" am: 46c951675d\nam: 8c65f360e1\n\nChange-Id: I849b9add549eb3014439fd043deee2c0d05f5bc1\n" }, { "commit": "8c65f360e19791c971f71c165bb22adc3ed11092", "tree": "ec8f607b9f2d1512aa99796cf5954e5ddb2d2f24", "parents": [ "652cdbe912e95fa390ea8b158f2de17d80798ccf", "46c951675db25fd880bb97ef191108dd0746d13c" ], "author": { "name": "George Burgess IV", "email": "gbiv@google.com", "time": "Tue Apr 03 17:22:55 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Apr 03 17:22:55 2018 -0700" }, "message": "Merge \"Update the SDK version of Scrypt\"\nam: 46c951675d\n\nChange-Id: I43ef0f429f77dc680be7dcd4cb9404ff414afd55\n" }, { "commit": "46c951675db25fd880bb97ef191108dd0746d13c", "tree": "ec8f607b9f2d1512aa99796cf5954e5ddb2d2f24", "parents": [ "652cdbe912e95fa390ea8b158f2de17d80798ccf", "6720fe35f86b69713c92e1839bc89203f5236c4c" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 04 00:10:42 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Apr 04 00:10:42 2018 +0000" }, "message": "Merge \"Update the SDK version of Scrypt\"" }, { "commit": "6720fe35f86b69713c92e1839bc89203f5236c4c", "tree": "ec8f607b9f2d1512aa99796cf5954e5ddb2d2f24", "parents": [ "652cdbe912e95fa390ea8b158f2de17d80798ccf" ], "author": { "name": "George Burgess IV", "email": "gbiv@google.com", "time": "Tue Apr 03 15:33:13 2018 -0700" }, "committer": { "name": "George Burgess IV", "email": "gbiv@google.com", "time": "Tue Apr 03 22:37:38 2018 +0000" }, "message": "Update the SDK version of Scrypt\n\nIt\u0027s relying on posix_memalign, which is only available as of SDK\nversion 17 (the ndk headers say 16, but I\u0027m told that\u0027s a bug\nthat\u0027ll be fixed soon).\n\nOriginally complained about by the static analyzer (and, presumably,\nclang):\nexternal/scrypt/lib/crypto/crypto_scrypt-neon.c:228:15: warning:\nimplicit declaration of function \u0027posix_memalign\u0027 is invalid in C99\n[-Wimplicit-function-declaration]\n\nBug: None\nTest: Builds on internal master without complaining about\nposix_memalign being implicitly declared.\n\nChange-Id: I5d9ecd79e0fb2372c92076bbf86e334132fb088f\n" }, { "commit": "1bcd68e1eb76f7ed62002d437f7c26cb1ab6c7dd", "tree": "d36d005a3c31025e2794d0e51727de3c572ecf33", "parents": [ "0df284cc21273ef9fd776cf2aaca551d7aee6186", "99dba2d5b0499fd2c8f8ae9d5cf4583a8ac824b8" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Tue Oct 03 08:10:02 2017 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Tue Oct 03 08:10:02 2017 +0000" }, "message": "Snap for 4373608 from 99dba2d5b0499fd2c8f8ae9d5cf4583a8ac824b8 to pi-release\n\nChange-Id: If5d09813bb0c734ce03e5515c0b81c6d74d98794\n" }, { "commit": "99dba2d5b0499fd2c8f8ae9d5cf4583a8ac824b8", "tree": "d36d005a3c31025e2794d0e51727de3c572ecf33", "parents": [ "003b37bbfe506eeb19b0131c12e01ce1ce098b50", "652cdbe912e95fa390ea8b158f2de17d80798ccf" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Mon Oct 02 22:07:02 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 02 22:07:02 2017 +0000" }, "message": "Merge \"Scrypt: remove unused include\" am: 9737bb84c9 am: d95a0100c0 am: ee712e7ad6\nam: 652cdbe912\n\nChange-Id: I6f5f8e83553ea16ba077869a9143123f26c8e849\n" }, { "commit": "652cdbe912e95fa390ea8b158f2de17d80798ccf", "tree": "d36d005a3c31025e2794d0e51727de3c572ecf33", "parents": [ "39f767da28da1bd31957a586f63b937d6f0ccdc6", "ee712e7ad66546d525198752e67dd89e3068b3fd" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Mon Oct 02 21:35:52 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 02 21:35:52 2017 +0000" }, "message": "Merge \"Scrypt: remove unused include\" am: 9737bb84c9 am: d95a0100c0\nam: ee712e7ad6\n\nChange-Id: Ied30aeb844a817f12bb22d333ba74a44e16b0279\n" }, { "commit": "ee712e7ad66546d525198752e67dd89e3068b3fd", "tree": "d36d005a3c31025e2794d0e51727de3c572ecf33", "parents": [ "9b1807ba4f5f1c77f47e2ed6f3e06370e1824385", "d95a0100c0df1e671008483b244cabc74300b487" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Mon Oct 02 21:27:31 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 02 21:27:31 2017 +0000" }, "message": "Merge \"Scrypt: remove unused include\" am: 9737bb84c9\nam: d95a0100c0\n\nChange-Id: Id5d97e1a517c35799e1ba115745258116cef1963\n" }, { "commit": "d95a0100c0df1e671008483b244cabc74300b487", "tree": "d36d005a3c31025e2794d0e51727de3c572ecf33", "parents": [ "1ef1ce7c0e42c493f98cac8c6c2471f0c2d0241e", "9737bb84c923faa0b3dfe7cdece17f1b84d42784" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Mon Oct 02 21:16:10 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 02 21:16:10 2017 +0000" }, "message": "Merge \"Scrypt: remove unused include\"\nam: 9737bb84c9\n\nChange-Id: I04781fd8cdb53a53c136df735f0811cb3cea3096\n" }, { "commit": "9737bb84c923faa0b3dfe7cdece17f1b84d42784", "tree": "d36d005a3c31025e2794d0e51727de3c572ecf33", "parents": [ "bcc2d0c8ec89519b45fe7e8f2b474dca30d8859b", "72a7711f02516a0475106c6cc9a8f7c468d2a852" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Oct 02 20:43:52 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 02 20:43:52 2017 +0000" }, "message": "Merge \"Scrypt: remove unused include\"" }, { "commit": "72a7711f02516a0475106c6cc9a8f7c468d2a852", "tree": "d36d005a3c31025e2794d0e51727de3c572ecf33", "parents": [ "bcc2d0c8ec89519b45fe7e8f2b474dca30d8859b" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Mon Oct 02 11:45:58 2017 -0700" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Mon Oct 02 11:45:58 2017 -0700" }, "message": "Scrypt: remove unused include\n\nIn preparation for removal.\n\nTest: mmma external/scrypt\nChange-Id: Id2b8525a93cfad74ce8c82e1e2244d1a64a24f4f\n" }, { "commit": "0df284cc21273ef9fd776cf2aaca551d7aee6186", "tree": "f02caa6cc78e1135b3e244b04f806a709b7d63f2", "parents": [ "605fbdb7e772c31c6c57ed43a03b386ff46004d7", "003b37bbfe506eeb19b0131c12e01ce1ce098b50" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Sat Sep 30 08:17:51 2017 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Sat Sep 30 08:17:51 2017 +0000" }, "message": "release-request-b4bc7b84-64b6-4176-8f16-ce17068fad13-for-git_pi-release-4370135 snap-temp-L93500000107644030\n\nChange-Id: I04e1e5751870767f4abe215c453edd30f802a549\n" }, { "commit": "003b37bbfe506eeb19b0131c12e01ce1ce098b50", "tree": "f02caa6cc78e1135b3e244b04f806a709b7d63f2", "parents": [ "495b0b37b4ecd736d9e4e15dfc44ff3cfdc2ed53", "39f767da28da1bd31957a586f63b937d6f0ccdc6" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Fri Sep 29 21:33:10 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 29 21:33:10 2017 +0000" }, "message": "Merge \"Use -Werror in external/scrypt\" am: bcc2d0c8ec am: 1ef1ce7c0e am: 9b1807ba4f\nam: 39f767da28\n\nChange-Id: I567257ab15938696a937de62a3d190d37a12f1c8\n" }, { "commit": "39f767da28da1bd31957a586f63b937d6f0ccdc6", "tree": "f02caa6cc78e1135b3e244b04f806a709b7d63f2", "parents": [ "dfe429ef2543ed9fd544ccbceacf5b3e3a64355c", "9b1807ba4f5f1c77f47e2ed6f3e06370e1824385" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Fri Sep 29 21:30:49 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 29 21:30:49 2017 +0000" }, "message": "Merge \"Use -Werror in external/scrypt\" am: bcc2d0c8ec am: 1ef1ce7c0e\nam: 9b1807ba4f\n\nChange-Id: I46ba02355d43658274c97adb530b63f9794269ee\n" }, { "commit": "9b1807ba4f5f1c77f47e2ed6f3e06370e1824385", "tree": "f02caa6cc78e1135b3e244b04f806a709b7d63f2", "parents": [ "c40aced8638d66d651bc860e236aa68282711be0", "1ef1ce7c0e42c493f98cac8c6c2471f0c2d0241e" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Fri Sep 29 21:28:52 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 29 21:28:52 2017 +0000" }, "message": "Merge \"Use -Werror in external/scrypt\" am: bcc2d0c8ec\nam: 1ef1ce7c0e\n\nChange-Id: Ib4f1b0c940c55ef5c71fba87fd7afc76eab3778a\n" }, { "commit": "1ef1ce7c0e42c493f98cac8c6c2471f0c2d0241e", "tree": "f02caa6cc78e1135b3e244b04f806a709b7d63f2", "parents": [ "62f9d716cd7019cfc6db72bf0abd2a00cede745e", "bcc2d0c8ec89519b45fe7e8f2b474dca30d8859b" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Fri Sep 29 21:27:28 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 29 21:27:28 2017 +0000" }, "message": "Merge \"Use -Werror in external/scrypt\"\nam: bcc2d0c8ec\n\nChange-Id: I2420e788dd4515a99e7fcdf7af3b36525f4ac6bd\n" }, { "commit": "bcc2d0c8ec89519b45fe7e8f2b474dca30d8859b", "tree": "f02caa6cc78e1135b3e244b04f806a709b7d63f2", "parents": [ "0b06038e149d363b52a9fa5c3125a9e6870e0f7c", "66d036e3e1daadd478427bb4edd66b5e3b2ba312" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Sep 29 21:20:40 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Sep 29 21:20:40 2017 +0000" }, "message": "Merge \"Use -Werror in external/scrypt\"" }, { "commit": "66d036e3e1daadd478427bb4edd66b5e3b2ba312", "tree": "f02caa6cc78e1135b3e244b04f806a709b7d63f2", "parents": [ "0b06038e149d363b52a9fa5c3125a9e6870e0f7c" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Fri Sep 29 10:45:56 2017 -0700" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Fri Sep 29 11:02:08 2017 -0700" }, "message": "Use -Werror in external/scrypt\n\n* Use -Wno-error\u003d to Keep existing warnings to fix later.\n\nBug: 66996870\nTest: build with WITH_TIDY\u003d1\nChange-Id: I8b9847aaceaa223b34391ac94ac35924af9caccc\n" }, { "commit": "605fbdb7e772c31c6c57ed43a03b386ff46004d7", "tree": "0a03e1518de9f84f486003a4888f2b7561cd8019", "parents": [ "da42ed72b295a0e1cd170b78c0ae484a7172131c", "495b0b37b4ecd736d9e4e15dfc44ff3cfdc2ed53" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Thu Sep 14 08:07:01 2017 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Thu Sep 14 08:07:01 2017 +0000" }, "message": "release-request-b06579bd-a905-4db5-ada9-c69d40f4df90-for-git_pi-release-4335309 snap-temp-L62700000102430107\n\nChange-Id: I3082b49c8e930ff568dc999d6a11806ec74705d5\n" }, { "commit": "495b0b37b4ecd736d9e4e15dfc44ff3cfdc2ed53", "tree": "0a03e1518de9f84f486003a4888f2b7561cd8019", "parents": [ "89b045c0b26025f229908c7879374f974b44dc1c", "dfe429ef2543ed9fd544ccbceacf5b3e3a64355c" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Thu Sep 14 04:11:44 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 14 04:11:44 2017 +0000" }, "message": "Enable arm64 neon scrypt implementation am: 58a2d19076 -s ours\nam: dfe429ef25 -s ours\n\nChange-Id: If3051947fb0768b503802f648542b9ad2949b35f\n" }, { "commit": "89b045c0b26025f229908c7879374f974b44dc1c", "tree": "0a03e1518de9f84f486003a4888f2b7561cd8019", "parents": [ "c043fd31a314b884a1cabd93cc230b4749c03994", "a87f729dfa5e2b9571566043c54c4c23b3efa1f1" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Thu Sep 14 04:11:42 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 14 04:11:42 2017 +0000" }, "message": "Mark libscrypt_static as vendor_available am: 05c326f69f -s ours\nam: a87f729dfa -s ours\n\nChange-Id: Ia75bb37a6943ce1639138b1aad366ce563b1b23b\n" }, { "commit": "c043fd31a314b884a1cabd93cc230b4749c03994", "tree": "0a03e1518de9f84f486003a4888f2b7561cd8019", "parents": [ "9589dd16d6741ee659f9d4fd60a3ade1c7daed25", "a4ae88a0a022a91281accd158ed1f447c6ce44ba" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Thu Sep 14 04:11:39 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 14 04:11:39 2017 +0000" }, "message": "Convert Android.mk to Android.bp am: 0ab01106aa -s ours\nam: a4ae88a0a0 -s ours\n\nChange-Id: I72c5657e66816f578da4347cf33314efb1c66cc7\n" }, { "commit": "9589dd16d6741ee659f9d4fd60a3ade1c7daed25", "tree": "0a03e1518de9f84f486003a4888f2b7561cd8019", "parents": [ "62e3c695220cf5f92ac1d2b37199e61c8ea90304", "9df37cf822418b23c2258e992f9bd78a4ea104e3" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Thu Sep 14 04:11:37 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 14 04:11:37 2017 +0000" }, "message": "Fix import_scrypt.sh am: 99a9876066 -s ours\nam: 9df37cf822 -s ours\n\nChange-Id: I069cc36dcde12d5810d1bee896d38ac2259b1cef\n" }, { "commit": "dfe429ef2543ed9fd544ccbceacf5b3e3a64355c", "tree": "0a03e1518de9f84f486003a4888f2b7561cd8019", "parents": [ "a87f729dfa5e2b9571566043c54c4c23b3efa1f1", "58a2d1907659e946c768f24b7b1d3dc705a86bb6" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Thu Sep 14 03:58:06 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 14 03:58:06 2017 +0000" }, "message": "Enable arm64 neon scrypt implementation\nam: 58a2d19076 -s ours\n\nChange-Id: I78327987075c0d12166ca34d1a039f00e17fb364\n" }, { "commit": "a87f729dfa5e2b9571566043c54c4c23b3efa1f1", "tree": "0a03e1518de9f84f486003a4888f2b7561cd8019", "parents": [ "a4ae88a0a022a91281accd158ed1f447c6ce44ba", "05c326f69fafc71cbe521291196515c076718d4c" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Thu Sep 14 03:58:03 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 14 03:58:03 2017 +0000" }, "message": "Mark libscrypt_static as vendor_available\nam: 05c326f69f -s ours\n\nChange-Id: Ia1e341db5e0071e2dfa1f9590ec3105cd51429cf\n" }, { "commit": "a4ae88a0a022a91281accd158ed1f447c6ce44ba", "tree": "0a03e1518de9f84f486003a4888f2b7561cd8019", "parents": [ "9df37cf822418b23c2258e992f9bd78a4ea104e3", "0ab01106aa8fd0b97fbb194441ffbb6980aad3ae" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Thu Sep 14 03:58:01 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 14 03:58:01 2017 +0000" }, "message": "Convert Android.mk to Android.bp\nam: 0ab01106aa -s ours\n\nChange-Id: Idc91649f214e1ea9381c7af568f85e47735a50df\n" }, { "commit": "9df37cf822418b23c2258e992f9bd78a4ea104e3", "tree": "0a03e1518de9f84f486003a4888f2b7561cd8019", "parents": [ "c187a38651aa7921033e001cf0d7240488142990", "99a9876066d5ed656dc05740a94348873b61fe7a" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Thu Sep 14 03:57:58 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 14 03:57:58 2017 +0000" }, "message": "Fix import_scrypt.sh\nam: 99a9876066 -s ours\n\nChange-Id: Id066c16f6c9844ebaf2197c1c647d5d342e3b38c\n" }, { "commit": "62e3c695220cf5f92ac1d2b37199e61c8ea90304", "tree": "0a03e1518de9f84f486003a4888f2b7561cd8019", "parents": [ "da42ed72b295a0e1cd170b78c0ae484a7172131c", "c187a38651aa7921033e001cf0d7240488142990" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Thu Sep 14 01:40:33 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 14 01:40:33 2017 +0000" }, "message": "Merge changes If40a3037,I06bcc80c,I8e901b0b,I843a2144 am: 0b06038e14 am: 62f9d716cd am: c40aced863\nam: c187a38651\n\nChange-Id: Iffd56dd83d43ac9822f76346732bc41d84c80d95\n" }, { "commit": "c187a38651aa7921033e001cf0d7240488142990", "tree": "0a03e1518de9f84f486003a4888f2b7561cd8019", "parents": [ "da42ed72b295a0e1cd170b78c0ae484a7172131c", "c40aced8638d66d651bc860e236aa68282711be0" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Wed Sep 13 23:35:21 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 13 23:35:21 2017 +0000" }, "message": "Merge changes If40a3037,I06bcc80c,I8e901b0b,I843a2144 am: 0b06038e14 am: 62f9d716cd\nam: c40aced863\n\nChange-Id: Id3ed659a318b0e319f47588c8b16eae00bff4cee\n" }, { "commit": "c40aced8638d66d651bc860e236aa68282711be0", "tree": "0a03e1518de9f84f486003a4888f2b7561cd8019", "parents": [ "9af45b854438aa16933227eae3957d6653286beb", "62f9d716cd7019cfc6db72bf0abd2a00cede745e" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Wed Sep 13 22:03:58 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 13 22:03:58 2017 +0000" }, "message": "Merge changes If40a3037,I06bcc80c,I8e901b0b,I843a2144 am: 0b06038e14\nam: 62f9d716cd\n\nChange-Id: Iabf20beb5b064826ca28ac11d5a2bf9a39ad3e6f\n" }, { "commit": "62f9d716cd7019cfc6db72bf0abd2a00cede745e", "tree": "0a03e1518de9f84f486003a4888f2b7561cd8019", "parents": [ "9af45b854438aa16933227eae3957d6653286beb", "0b06038e149d363b52a9fa5c3125a9e6870e0f7c" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Wed Sep 13 21:49:57 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 13 21:49:57 2017 +0000" }, "message": "Merge changes If40a3037,I06bcc80c,I8e901b0b,I843a2144\nam: 0b06038e14\n\nChange-Id: If19509c6c81b2e57c7e51f838390de150998ff29\n" }, { "commit": "0b06038e149d363b52a9fa5c3125a9e6870e0f7c", "tree": "0a03e1518de9f84f486003a4888f2b7561cd8019", "parents": [ "581021037c04fb2cd8dcbfd643cd9b9545f6a2b2", "8db5d07cefdae3008e19ee3fdf63b7a10d14dbff" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Wed Sep 13 01:37:33 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 13 01:37:33 2017 +0000" }, "message": "Merge changes If40a3037,I06bcc80c,I8e901b0b,I843a2144\n\n* changes:\n Enable arm64 neon scrypt implementation\n Mark libscrypt_static as vendor_available\n Convert Android.mk to Android.bp\n Fix import_scrypt.sh\n" }, { "commit": "58a2d1907659e946c768f24b7b1d3dc705a86bb6", "tree": "0a03e1518de9f84f486003a4888f2b7561cd8019", "parents": [ "05c326f69fafc71cbe521291196515c076718d4c" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Thu Aug 31 21:48:38 2017 +0800" }, "committer": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Tue Sep 12 14:42:24 2017 +0800" }, "message": "Enable arm64 neon scrypt implementation\n\nIt seems that old Scrypt-config.mk is unaware of arm64 architecture.\nIn fact, crypto_scrypt-neon.c can be compiled into arm64 as well. This\nCL adds an arch section for arm64.\n\nBug: 65425184\nTest: adb shell /data/nativetest64/scrypt_test/scrypt_test\nChange-Id: Ib451de642c7cc4548bfdc0879781981654b21b8f\nMerged-In: If40a30378b8038324aad44071107130d7722e28d\n" }, { "commit": "05c326f69fafc71cbe521291196515c076718d4c", "tree": "1721691da9860451a1d833600b62cc359fc8f1e4", "parents": [ "0ab01106aa8fd0b97fbb194441ffbb6980aad3ae" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Thu Aug 31 21:21:35 2017 +0800" }, "committer": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Tue Sep 12 14:42:08 2017 +0800" }, "message": "Mark libscrypt_static as vendor_available\n\nThis commit marks libscrypt_static as vendor_available so that vendor\nmodules can depend on libscrypt_static.\n\nBug: 65425184\nTest: BOARD_VNDK_VERSION\u003dcurrent mm -j8\n\nChange-Id: I98a99b09b5bf28814ce294337aff97d7bbc837a0\nMerged-In: I06bcc80cb71c60d75bf15873632042e72bf3f57c\n" }, { "commit": "0ab01106aa8fd0b97fbb194441ffbb6980aad3ae", "tree": "090e2efe19c843ffd7475c70079c05bc9f643b7e", "parents": [ "99a9876066d5ed656dc05740a94348873b61fe7a" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Thu Aug 31 15:38:01 2017 +0800" }, "committer": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Tue Sep 12 14:41:54 2017 +0800" }, "message": "Convert Android.mk to Android.bp\n\nThis commit converts Android.mk, android-config.mk, Scrypt.mk, and\nScrypt-config.mk files to an Android.bp file.\n\nIf BOARD_VNDK_VERSION is set to current, vendor modules won\u0027t be allowed\nto link libscrypt_static. To make libscrypt_static available to vendor\nmodules, we have to set vendor_available to true. However,\nvendor_available is an Android.bp feature, thus we have to convert\nAndroid.mk to Android.bp first.\n\nBug: 65425184\nTest: mm -j8 \u0026\u0026 adb sync \u0026\u0026 adb shell /data/nativetest/scrypt_test/scrypt_test\nTest: mm -j8 \u0026\u0026 adb sync \u0026\u0026 \\\n adb shell /data/nativetest64/scrypt_test/scrypt_test\n\nChange-Id: I5f4c574c0ebb00eca4a52ad230dedc4ac05ff711\nMerged-In: I8e901b0b1bec172d5e57f529ca76eae1c57def6a\n" }, { "commit": "99a9876066d5ed656dc05740a94348873b61fe7a", "tree": "114f68e6444a78a0cb4dd6f432593a538210e59b", "parents": [ "da42ed72b295a0e1cd170b78c0ae484a7172131c" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Thu Aug 31 19:15:50 2017 +0800" }, "committer": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Tue Sep 12 14:40:55 2017 +0800" }, "message": "Fix import_scrypt.sh\n\nThis commit fixes various issues in import_scrypt.sh:\n\n* Add `-N` option to `diff` command so that arm_neon.diff can be\n generated by import_scrypt.sh\n\n* Rename SCRYPT_PATCHES_bionic_SOURCES to\n SCRYPT_PATCHES_arm_neon_SOURCES\n\n* Reorder SCRYPT_PATCHES_arm_neon_SOURCES to mimic git-diff output\n\n* Add missing `lib/crypto/crypto_scrypt-sse.c` file for\n use_openssl_pbkdf2.patch\n\n* Add `-f` to `rm` command in the `generate` command because `config.h`\n is not in the upstream release tarball\n\n* Replace typo `$SCRYPT_DIR_ORIG_ORIG` with `$SCRYPT_DIR_ORIG`\n\n* Rename arm-neon.patch to arm_neon.patch (for consistency)\n\nBug: 65425184\nTest: ./import_scrypt.sh import upstream/scrypt-1.1.6.tgz\nTest: ./import_scrypt.sh generate patches/arm_neon.patch \\\n upstream/scrypt-1.1.6.tgz\nTest: ./import_scrypt.sh generate patches/use_openssl_pbkdf2.patch \\\n upstream/scrypt-1.1.6.tgz\n\nChange-Id: I56d912313e35c1127e18b49cff0b429837b08e77\nMerged-In: I843a21440527ed4037525468e9f66630f24b4cee\n" }, { "commit": "8db5d07cefdae3008e19ee3fdf63b7a10d14dbff", "tree": "0a03e1518de9f84f486003a4888f2b7561cd8019", "parents": [ "430d10a7f45ce03e332bca49f653cc24248791f4" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Thu Aug 31 21:48:38 2017 +0800" }, "committer": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Tue Sep 12 14:34:44 2017 +0800" }, "message": "Enable arm64 neon scrypt implementation\n\nIt seems that old Scrypt-config.mk is unaware of arm64 architecture.\nIn fact, crypto_scrypt-neon.c can be compiled into arm64 as well. This\nCL adds an arch section for arm64.\n\nBug: 65425184\nTest: adb shell /data/nativetest64/scrypt_test/scrypt_test\nChange-Id: If40a30378b8038324aad44071107130d7722e28d\n" }, { "commit": "430d10a7f45ce03e332bca49f653cc24248791f4", "tree": "1721691da9860451a1d833600b62cc359fc8f1e4", "parents": [ "ee1d014f108d3578425ce594c636be211c50ecfb" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Thu Aug 31 21:21:35 2017 +0800" }, "committer": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Tue Sep 12 14:34:44 2017 +0800" }, "message": "Mark libscrypt_static as vendor_available\n\nThis commit marks libscrypt_static as vendor_available so that vendor\nmodules can depend on libscrypt_static.\n\nBug: 65425184\nTest: BOARD_VNDK_VERSION\u003dcurrent mm -j8\n\nChange-Id: I06bcc80cb71c60d75bf15873632042e72bf3f57c\n" }, { "commit": "ee1d014f108d3578425ce594c636be211c50ecfb", "tree": "090e2efe19c843ffd7475c70079c05bc9f643b7e", "parents": [ "629ed239a9d27f2b58697ef48d7a12c81e5d74cf" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Thu Aug 31 15:38:01 2017 +0800" }, "committer": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Tue Sep 12 14:34:44 2017 +0800" }, "message": "Convert Android.mk to Android.bp\n\nThis commit converts Android.mk, android-config.mk, Scrypt.mk, and\nScrypt-config.mk files to an Android.bp file.\n\nIf BOARD_VNDK_VERSION is set to current, vendor modules won\u0027t be allowed\nto link libscrypt_static. To make libscrypt_static available to vendor\nmodules, we have to set vendor_available to true. However,\nvendor_available is an Android.bp feature, thus we have to convert\nAndroid.mk to Android.bp first.\n\nBug: 65425184\nTest: mm -j8 \u0026\u0026 adb sync \u0026\u0026 adb shell /data/nativetest/scrypt_test/scrypt_test\nTest: mm -j8 \u0026\u0026 adb sync \u0026\u0026 \\\n adb shell /data/nativetest64/scrypt_test/scrypt_test\n\nChange-Id: I8e901b0b1bec172d5e57f529ca76eae1c57def6a\n" }, { "commit": "629ed239a9d27f2b58697ef48d7a12c81e5d74cf", "tree": "114f68e6444a78a0cb4dd6f432593a538210e59b", "parents": [ "581021037c04fb2cd8dcbfd643cd9b9545f6a2b2" ], "author": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Thu Aug 31 19:15:50 2017 +0800" }, "committer": { "name": "Logan Chien", "email": "loganchien@google.com", "time": "Tue Sep 12 14:34:44 2017 +0800" }, "message": "Fix import_scrypt.sh\n\nThis commit fixes various issues in import_scrypt.sh:\n\n* Add `-N` option to `diff` command so that arm_neon.diff can be\n generated by import_scrypt.sh\n\n* Rename SCRYPT_PATCHES_bionic_SOURCES to\n SCRYPT_PATCHES_arm_neon_SOURCES\n\n* Reorder SCRYPT_PATCHES_arm_neon_SOURCES to mimic git-diff output\n\n* Add missing `lib/crypto/crypto_scrypt-sse.c` file for\n use_openssl_pbkdf2.patch\n\n* Add `-f` to `rm` command in the `generate` command because `config.h`\n is not in the upstream release tarball\n\n* Replace typo `$SCRYPT_DIR_ORIG_ORIG` with `$SCRYPT_DIR_ORIG`\n\n* Rename arm-neon.patch to arm_neon.patch (for consistency)\n\nBug: 65425184\nTest: ./import_scrypt.sh import upstream/scrypt-1.1.6.tgz\nTest: ./import_scrypt.sh generate patches/arm_neon.patch \\\n upstream/scrypt-1.1.6.tgz\nTest: ./import_scrypt.sh generate patches/use_openssl_pbkdf2.patch \\\n upstream/scrypt-1.1.6.tgz\n\nChange-Id: I843a21440527ed4037525468e9f66630f24b4cee\n" }, { "commit": "da42ed72b295a0e1cd170b78c0ae484a7172131c", "tree": "f6106201e218a92de3b7504ddbbd6e6c37069d74", "parents": [ "9b4f76d5c1a591e76fa07e04678687fb020d22e5", "9af45b854438aa16933227eae3957d6653286beb" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Jul 19 15:16:45 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 15:16:45 2017 +0000" }, "message": "Merge \"external/scrypt: use proper nativehelper headers\" am: a1026771cc am: 581021037c am: ffa1823922\nam: 9af45b8544\n\nChange-Id: I1855c2a0f3e948ae88309dc510aab345586a539b\n" }, { "commit": "9af45b854438aa16933227eae3957d6653286beb", "tree": "f6106201e218a92de3b7504ddbbd6e6c37069d74", "parents": [ "28f5f2d2a30a8b8690116ce7d46f6397479b26e6", "ffa182392224f333c483ffdd6c704bcb4a02994c" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Jul 19 15:13:45 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 15:13:45 2017 +0000" }, "message": "Merge \"external/scrypt: use proper nativehelper headers\" am: a1026771cc am: 581021037c\nam: ffa1823922\n\nChange-Id: Idf17477f118123e63776cd267b57f4806772008a\n" }, { "commit": "ffa182392224f333c483ffdd6c704bcb4a02994c", "tree": "f6106201e218a92de3b7504ddbbd6e6c37069d74", "parents": [ "a0a2dc382ec2a270553ae152e1abd308c708854e", "581021037c04fb2cd8dcbfd643cd9b9545f6a2b2" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Jul 19 15:10:44 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 15:10:44 2017 +0000" }, "message": "Merge \"external/scrypt: use proper nativehelper headers\" am: a1026771cc\nam: 581021037c\n\nChange-Id: Iadb6fc6102e2e03fdc88875f45a130d488c18b9b\n" }, { "commit": "581021037c04fb2cd8dcbfd643cd9b9545f6a2b2", "tree": "f6106201e218a92de3b7504ddbbd6e6c37069d74", "parents": [ "a0a2dc382ec2a270553ae152e1abd308c708854e", "a1026771ccb71c69a4b31d726473feaa32ab4e6a" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Jul 19 15:07:45 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 15:07:45 2017 +0000" }, "message": "Merge \"external/scrypt: use proper nativehelper headers\"\nam: a1026771cc\n\nChange-Id: Ic67ebd42bf2aa2ea81a52d013241baea333136aa\n" }, { "commit": "a1026771ccb71c69a4b31d726473feaa32ab4e6a", "tree": "f6106201e218a92de3b7504ddbbd6e6c37069d74", "parents": [ "b7477d8eedb4aaf9ad5af921ea43bfe17103a23a", "916c78ab6676f9842912bbb2a6f3102bce85c4ee" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jul 19 15:03:31 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jul 19 15:03:31 2017 +0000" }, "message": "Merge \"external/scrypt: use proper nativehelper headers\"" }, { "commit": "916c78ab6676f9842912bbb2a6f3102bce85c4ee", "tree": "f6106201e218a92de3b7504ddbbd6e6c37069d74", "parents": [ "b7477d8eedb4aaf9ad5af921ea43bfe17103a23a" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Tue Jul 18 16:53:51 2017 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Tue Jul 18 16:53:51 2017 -0700" }, "message": "external/scrypt: use proper nativehelper headers\n\nlibnativeheader exports headers under nativeheader. These were\navailable before incorrectly as global headers in order to give\naccess to jni.h.\n\nTest: modules using external/scrypt find headers\nBug: 63762847\nChange-Id: I9baf896015a1920f8a26daa2a0c549169628890f\n" }, { "commit": "9b4f76d5c1a591e76fa07e04678687fb020d22e5", "tree": "3a791953b6a902acd9846c6abf02fe8e216df391", "parents": [ "aed3ac4c6bb550db63922831178d32468b4c6440", "28f5f2d2a30a8b8690116ce7d46f6397479b26e6" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Jun 16 16:17:13 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 16 16:17:13 2017 +0000" }, "message": "Merge \"Add OWNERS in external/scrypt\" am: b7477d8eed am: e236788532 am: a0a2dc382e\nam: 28f5f2d2a3\n\nChange-Id: Ia3d87eabbdce6b5ca695c1ccf85fdf42ae887c4e\n" }, { "commit": "28f5f2d2a30a8b8690116ce7d46f6397479b26e6", "tree": "3a791953b6a902acd9846c6abf02fe8e216df391", "parents": [ "aed3ac4c6bb550db63922831178d32468b4c6440", "a0a2dc382ec2a270553ae152e1abd308c708854e" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Jun 16 16:13:44 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 16 16:13:44 2017 +0000" }, "message": "Merge \"Add OWNERS in external/scrypt\" am: b7477d8eed am: e236788532\nam: a0a2dc382e\n\nChange-Id: I3c42d68505db6adcbf6aef205c2e3cbdef6bb8cd\n" }, { "commit": "a0a2dc382ec2a270553ae152e1abd308c708854e", "tree": "3a791953b6a902acd9846c6abf02fe8e216df391", "parents": [ "aed3ac4c6bb550db63922831178d32468b4c6440", "e23678853279528f5701efa5d4bebc03c2582115" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Jun 16 16:09:44 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 16 16:09:44 2017 +0000" }, "message": "Merge \"Add OWNERS in external/scrypt\" am: b7477d8eed\nam: e236788532\n\nChange-Id: I660b36c7e5cbc4534a89cabf430a588397c8e786\n" }, { "commit": "e23678853279528f5701efa5d4bebc03c2582115", "tree": "3a791953b6a902acd9846c6abf02fe8e216df391", "parents": [ "99611dfb9ac7513ab39f569744439ee6c7568eba", "b7477d8eedb4aaf9ad5af921ea43bfe17103a23a" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Jun 16 16:06:11 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 16 16:06:11 2017 +0000" }, "message": "Merge \"Add OWNERS in external/scrypt\"\nam: b7477d8eed\n\nChange-Id: Ifdd24e0a245e69ba381ec28f678f84fb8babff0f\n" }, { "commit": "b7477d8eedb4aaf9ad5af921ea43bfe17103a23a", "tree": "3a791953b6a902acd9846c6abf02fe8e216df391", "parents": [ "99611dfb9ac7513ab39f569744439ee6c7568eba", "11bdcd8956e0f227bc1da0cc8848780052da5be8" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Jun 16 15:57:26 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 16 15:57:28 2017 +0000" }, "message": "Merge \"Add OWNERS in external/scrypt\"" }, { "commit": "11bdcd8956e0f227bc1da0cc8848780052da5be8", "tree": "3a791953b6a902acd9846c6abf02fe8e216df391", "parents": [ "99611dfb9ac7513ab39f569744439ee6c7568eba" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Thu Jun 15 14:33:54 2017 -0700" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Thu Jun 15 15:49:01 2017 -0700" }, "message": "Add OWNERS in external/scrypt\n\n* Owners are selected from top CL approvals or owners.\n They will be suggested to review/approve future CLs.\n* OWNERS files are recognized by the new find-owners plugin, see .md files in\n https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/\n\nTest: build/make/tools/checkowners.py -c -v OWNERS\nChange-Id: I41d1076af8926ae570cffd7f3341a4c76f2dc196\n" }, { "commit": "aed3ac4c6bb550db63922831178d32468b4c6440", "tree": "41b30c0ec70c212813b878d99d85cf3593afd8e1", "parents": [ "378add113dc14d48729c5bc66a5870faf0414e14", "99611dfb9ac7513ab39f569744439ee6c7568eba" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Sat Jul 23 00:41:10 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Jul 23 00:41:10 2016 +0000" }, "message": "Merge \\\\\\\\\"Rename lib{crypto,ssl}-host to lib{crypto,ssl}\\\\\\\\\" am: 4b2bd9665c am: b442b13773 am: 32be729d37\nam: 99611dfb9a\n\nChange-Id: I6336d3574bef526024a7ce10cf4e736565d9dd51\n" } ], "next": "99611dfb9ac7513ab39f569744439ee6c7568eba" }