summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.mk2
-rw-r--r--third_party/libevent/Android.mk3
2 files changed, 0 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index 1381d1d..c598799 100644
--- a/Android.mk
+++ b/Android.mk
@@ -460,7 +460,6 @@ LOCAL_GENERATED_SOURCES += $(GEN)
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DANDROID -fvisibility=hidden -DEXPAT_RELATIVE_PATH -DALLOW_QUOTED_COOKIE_VALUES
LOCAL_CPPFLAGS := -Wno-sign-promo -Wno-missing-field-initializers
-ifneq ($(TARGET_SIMULATOR),true)
# Just a few definitions not provided by bionic.
LOCAL_CFLAGS += -include "android/prefix.h"
@@ -475,6 +474,5 @@ LOCAL_WHOLE_STATIC_LIBRARIES += libevent libprotobuf-cpp-2.3.0-lite modp_b64 dmg
# Including this will modify the include path
include external/stlport/libstlport.mk
-endif
include $(BUILD_STATIC_LIBRARY)
diff --git a/third_party/libevent/Android.mk b/third_party/libevent/Android.mk
index 00bdf6b..c654937 100644
--- a/third_party/libevent/Android.mk
+++ b/third_party/libevent/Android.mk
@@ -20,8 +20,5 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/third_party/libevent/android
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DANDROID -fvisibility=hidden
-ifeq ($(TARGET_SIMULATOR),true)
-LOCAL_CFLAGS += -D_EVENT_HAVE_FD_MASK=1
-endif
include $(BUILD_STATIC_LIBRARY)