diff options
| author | Tim Murray <timmurray@google.com> | 2014-04-23 23:15:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-23 23:15:26 +0000 |
| commit | 8ef380fc5204fd7ff440d243e82298817b212614 (patch) | |
| tree | ca2dcf626899beaec56ddc7709440a455b3adda3 | |
| parent | 5db6f05ec4936f9f09159bf8c377280ae0a0c49f (diff) | |
| parent | 43d98c911f71b24901570feb85cb1f8fd7f70fe5 (diff) | |
| download | libpng-idea133-weekly-release.tar.gz | |
Merge "Use -no-integrated-as on Darwin."idea133-weekly-release
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 367ee4dae..b05ad6336 100644 --- a/Android.mk +++ b/Android.mk @@ -45,6 +45,11 @@ ifeq ($(HOST_OS),windows) 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 @@ include $(CLEAR_VARS) 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_CLANG := true 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_CLANG := true 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) \ |