| commit | 01bc4484be0125fae325fc00c8d9387de0e78d0a | [log] [tgz] |
|---|---|---|
| author | Tim Murray <[email protected]> | Wed Apr 23 22:55:08 2014 +0000 |
| committer | Gerrit Code Review <[email protected]> | Wed Apr 23 22:55:09 2014 +0000 |
| tree | 25c6554d5b4da9c7b4b8904597480ae64a4de651 | |
| parent | df2735d4aecddaa4063dd81fa8a45930f0133ba3 [diff] | |
| parent | 1cbc4cda496558aff903f16309d2799f09798213 [diff] |
Merge "Use -no-integrated-as on Darwin."
diff --git a/Crypto.mk b/Crypto.mk index 1724721..fa84e29 100644 --- a/Crypto.mk +++ b/Crypto.mk
@@ -28,6 +28,10 @@ # in the NDK. ifeq (,$(TARGET_BUILD_APPS)) LOCAL_CLANG := true +ifeq ($(HOST_OS), darwin) +LOCAL_ASFLAGS += -no-integrated-as +LOCAL_CFLAGS += -no-integrated-as +endif else LOCAL_SDK_VERSION := 9 endif