aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2016-06-13 16:57:07 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-13 16:57:07 +0000
commit6f25ce204f57a9eec9c514e5fa19ccdf8489cafd (patch)
tree72a66a8c7be517be7d8cee9cd4d6b75a1565fdb5
parent01f9a372ce004944bbaa0c1497d9ea8ace646b06 (diff)
parent4e88d040b7f3edeb74684f3831bba422eaadcdf3 (diff)
downloadlibpng-6f25ce204f57a9eec9c514e5fa19ccdf8489cafd.tar.gz
Turn off intel optimizations for host lib
am: 4e88d040b7 Change-Id: Ib028d9fe00cdd13b7201c30282c404af18eaa443
-rw-r--r--Android.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 14aba912a..c2e21ca80 100644
--- a/Android.mk
+++ b/Android.mk
@@ -47,8 +47,11 @@ LOCAL_SRC_FILES := $(common_SRC_FILES)
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