commit 43d98c911f71b24901570feb85cb1f8fd7f70fe5
author Tim Murray <timmurray@google.com> Wed Apr 23 15:34:05 2014 -0700
committer Tim Murray <timmurray@google.com> Wed Apr 23 22:36:06 2014 +0000
tree ca2dcf626899beaec56ddc7709440a455b3adda3
parent 5db6f05ec4936f9f09159bf8c377280ae0a0c49f

Use -no-integrated-as on Darwin.

Change-Id: Ib096eec1da985611882bc6c228a803b15c8d668c

Android.mk

diff --git a/Android.mk b/Android.mk
index 367ee4d..b05ad63 100644
--- a/Android.mk
+++ b/Android.mk
@@ -45,6 +45,11 @@
 	endif
 endif
 
+ifeq ($(HOST_OS),darwin)
+common_CFLAGS += -no-integrated-as
+common_ASFLAGS += -no-integrated-as
+endif
+
 common_C_INCLUDES +=
 
 common_COPY_HEADERS_TO := libpng
@@ -57,6 +62,7 @@
 
 LOCAL_SRC_FILES := $(common_SRC_FILES)
 LOCAL_CFLAGS += $(common_CFLAGS)
+LOCAL_ASFLAGS += $(common_ASFLAGS)
 LOCAL_C_INCLUDES += $(common_C_INCLUDES) external/zlib
 
 LOCAL_MODULE:= libpng
@@ -75,6 +81,7 @@
 LOCAL_SRC_FILES := $(common_SRC_FILES)
 LOCAL_CFLAGS += $(common_CFLAGS) -ftrapv
 LOCAL_CFLAGS_arm := $(my_cflags_arm)
+LOCAL_ASFLAGS += $(common_ASFLAGS)
 LOCAL_SRC_FILES_arm := $(my_src_files_arm)
 
 LOCAL_C_INCLUDES += $(common_C_INCLUDES) \
@@ -94,6 +101,7 @@
 LOCAL_SRC_FILES := $(common_SRC_FILES)
 LOCAL_CFLAGS += $(common_CFLAGS) -ftrapv
 LOCAL_CFLAGS_arm := $(my_cflags_arm)
+LOCAL_ASFLAGS += $(common_ASFLAGS)
 LOCAL_SRC_FILES_arm := $(my_src_files_arm)
 
 LOCAL_C_INCLUDES += $(common_C_INCLUDES) \