diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:07:54 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:07:54 +0000 |
commit | 37d5c61d49f40e5673e51a1aaf91cf79bf79a45e (patch) | |
tree | dc6c42b0486a718499f44207bac0580ff6964c26 | |
parent | f65cd9fd51e85d1c3ef16e7c67f584dacba50cea (diff) | |
parent | c6cbacee7e128674e7e2ed0ed83589bf3ef5e1e9 (diff) | |
download | scrypt-android14-mainline-os-statsd-release.tar.gz |
Snap for 10453563 from c6cbacee7e128674e7e2ed0ed83589bf3ef5e1e9 to mainline-os-statsd-releaseaml_sta_341615000aml_sta_341511040aml_sta_341410000aml_sta_341311010aml_sta_341114000aml_sta_341111000aml_sta_341010020aml_sta_340912000aml_sta_340911000aml_net_341111030android14-mainline-os-statsd-release
Change-Id: Ia8d5fb4ed8393792d6abba4938d1966d94b009bc
-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> |