Snap for 9595907 from c6cbacee7e128674e7e2ed0ed83589bf3ef5e1e9 to udc-releaseandroid-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-release

Change-Id: I25a0067a5a3e4c8c7dd09d13718b4379a7062eb0

3 files changed, 9 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 1d784fc..ae10e23 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,6 +53,11 @@ cc_library_static {
     sdk_version: "17",
     host_supported: true,
     vendor_available: true,
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
 }
 
 cc_test {
diff --git a/config.h b/config.h
index 3514f39..c388856 100644
--- a/config.h
+++ b/config.h
@@ -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>