commit b73232f04f56fed92f24a07604e8b0cc2d686245
author Brian Carlstrom <bdc@google.com> Wed Sep 12 15:58:23 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Wed Sep 12 15:58:23 2012 -0700
tree 6ed38ece8043e4c41ece2462b2f66c08411fd3aa
parent 591d8daf0adca543ee408e69bf3495abd204bfe5
parent 1d3c00a50b193ce606dc347e7ad61d58e6fad5a7

Merge "Disable x86 assembly on darwin"

Crypto.mk

diff --git a/Crypto.mk b/Crypto.mk
index 41e709b..cb1fbaf 100644
--- a/Crypto.mk
+++ b/Crypto.mk
@@ -650,7 +650,7 @@
 include $(LOCAL_PATH)/android-config.mk
 LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
 LOCAL_SRC_FILES += $(local_src_files)
-ifeq ($(HOST_ARCH),x86)
+ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
   LOCAL_SRC_FILES += $(x86_src_files)
   LOCAL_SRC_FILES := $(filter-out $(x86_exclude_files),$(LOCAL_SRC_FILES))
   LOCAL_CFLAGS += $(x86_cflags)
@@ -673,7 +673,7 @@
 include $(LOCAL_PATH)/android-config.mk
 LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
 LOCAL_SRC_FILES += $(local_src_files)
-ifeq ($(HOST_ARCH),x86)
+ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
   LOCAL_SRC_FILES += $(x86_src_files)
   LOCAL_SRC_FILES := $(filter-out $(x86_exclude_files),$(LOCAL_SRC_FILES))
   LOCAL_CFLAGS += $(x86_cflags)