diff options
author | Oystein Eftevaag <oysteine@google.com> | 2023-02-11 01:55:20 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-11 01:55:20 +0000 |
commit | c6cbacee7e128674e7e2ed0ed83589bf3ef5e1e9 (patch) | |
tree | dc6c42b0486a718499f44207bac0580ff6964c26 | |
parent | c3a5fc0e91d7b9cd3de426eef8d4ba17eac14eb7 (diff) | |
parent | c9bce8a96abc9f1234e005a0f45f3e99f0b00f83 (diff) | |
download | scrypt-c6cbacee7e128674e7e2ed0ed83589bf3ef5e1e9.tar.gz |
Merge "Enable Windows host compilation of scrypt" am: c09f61a395 am: 4c2a09a3c8 am: c9bce8a96aandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/scrypt/+/2414316
Change-Id: I50a66b0600741b9e6522abe2faca5fd7806a405e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 5 | ||||
-rw-r--r-- | config.h | 2 | ||||
-rw-r--r-- | lib/crypto/crypto_scrypt-sse.c | 2 |
3 files changed, 9 insertions, 0 deletions
@@ -53,6 +53,11 @@ cc_library_static { sdk_version: "17", host_supported: true, vendor_available: true, + target: { + windows: { + enabled: true, + }, + }, } cc_test { @@ -21,7 +21,9 @@ #define HAVE_MEMORY_H 1 /* Define to 1 if you have the `posix_memalign' function. */ +#ifndef _WIN32 #define HAVE_POSIX_MEMALIGN 1 +#endif /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 diff --git a/lib/crypto/crypto_scrypt-sse.c b/lib/crypto/crypto_scrypt-sse.c index dd18f29..c50204d 100644 --- a/lib/crypto/crypto_scrypt-sse.c +++ b/lib/crypto/crypto_scrypt-sse.c @@ -29,7 +29,9 @@ #include "scrypt_platform.h" #include <sys/types.h> +#ifndef _WIN32 #include <sys/mman.h> +#endif #include <emmintrin.h> #include <errno.h> |