diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-06-10 17:38:34 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2016-06-10 17:38:34 -0700 |
| commit | 4e88d040b7f3edeb74684f3831bba422eaadcdf3 (patch) | |
| tree | 72a66a8c7be517be7d8cee9cd4d6b75a1565fdb5 | |
| parent | aa0664c5f8c982896845eb73c4ae2c06ad3fe879 (diff) | |
| download | libpng-4e88d040b7f3edeb74684f3831bba422eaadcdf3.tar.gz | |
Turn off intel optimizations for host libnougat-dev
AAPT on Windows crashes with these optimizations turned on.
Bug:29279685
Change-Id: I209f49b7465be75535cbb7d2de6d0f2754e97717
| -rw-r--r-- | Android.mk | 7 |
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 |