diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 04:58:04 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 04:58:04 +0000 |
commit | 68a57cd86269c50098efd7a8b1de42c6d9a55d66 (patch) | |
tree | dc6c42b0486a718499f44207bac0580ff6964c26 | |
parent | b2947fe727acf19f64b12b609ac688e5cf5c56e0 (diff) | |
parent | c6cbacee7e128674e7e2ed0ed83589bf3ef5e1e9 (diff) | |
download | scrypt-68a57cd86269c50098efd7a8b1de42c6d9a55d66.tar.gz |
Snap for 10453563 from c6cbacee7e128674e7e2ed0ed83589bf3ef5e1e9 to mainline-media-swcodec-releaseaml_swc_341619000aml_swc_341513600aml_swc_341312300aml_swc_341312020aml_swc_341111000aml_swc_341011020aml_swc_340922010android14-mainline-media-swcodec-release
Change-Id: I05a12bfd913f3d635162aa27ac25835445d792e5
-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> |