commit 106a9f5260a146e74dc1cd755e33b12177df2bb8
author Adam Lesinski <adamlesinski@google.com> Mon Jun 13 16:57:07 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jun 13 16:57:07 2016 +0000
tree 72a66a8c7be517be7d8cee9cd4d6b75a1565fdb5
parent f724ab39595265a257d8a1c161fcc839b4af9066
parent 4e88d040b7f3edeb74684f3831bba422eaadcdf3

Turn off intel optimizations for host lib
am: 4e88d040b7

Change-Id: Id8d8c28ed3230f879646297c0976898385086d95

Android.mk

diff --git a/Android.mk b/Android.mk
index 14aba91..c2e21ca 100644
--- a/Android.mk
+++ b/Android.mk
@@ -47,8 +47,11 @@
 LOCAL_SRC_FILES_x86 += $(my_src_files_intel)
 LOCAL_SRC_FILES_x86_64 += $(my_src_files_intel)
 LOCAL_CFLAGS += $(common_CFLAGS)
-LOCAL_CFLAGS_x86 += $(my_cflags_intel)
-LOCAL_CFLAGS_x86_64 += $(my_cflags_intel)
+
+# Disable optimizations because they crash on windows
+# LOCAL_CFLAGS_x86 += $(my_cflags_intel)
+# LOCAL_CFLAGS_x86_64 += $(my_cflags_intel)
+
 LOCAL_ASFLAGS += $(common_ASFLAGS)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 LOCAL_STATIC_LIBRARIES := libz