Code drop from //branches/cupcake/...@124589
diff --git a/tools/apriori/Android.mk b/tools/apriori/Android.mk
index 71e4f4a..79ecf7f 100644
--- a/tools/apriori/Android.mk
+++ b/tools/apriori/Android.mk
@@ -5,19 +5,22 @@
LOCAL_PATH:= $(call my-dir)
-ifeq ($(TARGET_ARCH),arm)
+ifneq ($(TARGET_SIMULATOR),true)
include $(CLEAR_VARS)
LOCAL_LDLIBS += -ldl
LOCAL_CFLAGS += -O2 -g
LOCAL_CFLAGS += -fno-function-sections -fno-data-sections -fno-inline
LOCAL_CFLAGS += -Wall -Wno-unused-function #-Werror
-LOCAL_CFLAGS += -DBIG_ENDIAN=1
-LOCAL_CFLAGS += -DARM_SPECIFIC_HACKS
LOCAL_CFLAGS += -DSUPPORT_ANDROID_PRELINK_TAGS
LOCAL_CFLAGS += -DDEBUG
LOCAL_CFLAGS += -DADJUST_ELF=1
+ifeq ($(TARGET_ARCH),arm)
+LOCAL_CFLAGS += -DARM_SPECIFIC_HACKS
+LOCAL_CFLAGS += -DBIG_ENDIAN=1
+endif
+
ifeq ($(HOST_OS),darwin)
LOCAL_CFLAGS += -DFSCANF_IS_BROKEN
endif
@@ -46,9 +49,13 @@
external/elfutils/libebl/ \
external/elfcopy/
-LOCAL_STATIC_LIBRARIES := libelfcopy libelf libebl libebl_arm #dl
+LOCAL_STATIC_LIBRARIES := libelfcopy libelf libebl #dl
+
+ifeq ($(TARGET_ARCH),arm)
+LOCAL_STATIC_LIBRARIES += libebl_arm
+endif
LOCAL_MODULE := apriori
include $(BUILD_HOST_EXECUTABLE)
-endif #TARGET_ARCH==arm
+endif # TARGET_SIMULATOR != true