diff --git a/Android.mk b/Android.mk index 43d5499e3..7c3975104 100644 --- a/Android.mk +++ b/Android.mk @@ -16,9 +16,4 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(TARGET_SIMULATOR),true) - include $(call all-subdir-makefiles) -else - # The host dalvikvm needs Android's concatenated & indexed timezone data. - include $(LOCAL_PATH)/libc/zoneinfo/Android.mk -endif +include $(call all-subdir-makefiles) diff --git a/libdl/Android.mk b/libdl/Android.mk index 8d56f9a41..d2289f823 100644 --- a/libdl/Android.mk +++ b/libdl/Android.mk @@ -18,11 +18,9 @@ include $(CLEAR_VARS) LOCAL_LDFLAGS := -Wl,--exclude-libs=libgcc.a # for x86, exclude libgcc_eh.a for the same reasons as above -ifneq ($(TARGET_SIMULATOR),true) ifeq ($(TARGET_ARCH),x86) LOCAL_LDFLAGS += -Wl,--exclude-libs=libgcc_eh.a endif -endif LOCAL_SRC_FILES:= libdl.c