diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-06-05 18:34:09 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-06-05 18:34:09 +0200 |
| commit | 626c2706b1f7abdc6af1216873b7687e59025d1f (patch) | |
| tree | 0617ebb1e49364082071482aa9a977dd1da45940 /main/openssl/Crypto.mk | |
| parent | 614b8790e5fc0bb3864eb2e3dd8c15016333d016 (diff) | |
Update OpenSSL to aosp/masterc0.6.13
--HG--
extra : rebase_source : a2f70c1a7529c7fcfc88f8dd1882e66e6ba42167
Diffstat (limited to 'main/openssl/Crypto.mk')
| -rw-r--r-- | main/openssl/Crypto.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/openssl/Crypto.mk b/main/openssl/Crypto.mk index 9c558d9e..4214b91e 100644 --- a/main/openssl/Crypto.mk +++ b/main/openssl/Crypto.mk @@ -31,6 +31,10 @@ LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) # in the NDK. ifeq (,$(TARGET_BUILD_APPS)) LOCAL_CLANG := true +ifeq ($(HOST_OS), darwin_XXX) +LOCAL_ASFLAGS += -no-integrated-as +LOCAL_CFLAGS += -no-integrated-as +endif else LOCAL_SDK_VERSION := 9 endif |