Remove the simulator target from all makefiles.

Bug: 5010576

Change-Id: I9064e3221582fcf3d4210d67f1cf0a96e7e3aa86
This commit is contained in:
Jeff Brown 2011-07-11 22:11:41 -07:00
parent 221595a085
commit 7e5d19c055
2 changed files with 1 additions and 8 deletions

View file

@ -16,9 +16,4 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
ifneq ($(TARGET_SIMULATOR),true) include $(call all-subdir-makefiles)
include $(call all-subdir-makefiles)
else
# The host dalvikvm needs Android's concatenated & indexed timezone data.
include $(LOCAL_PATH)/libc/zoneinfo/Android.mk
endif

View file

@ -18,11 +18,9 @@ include $(CLEAR_VARS)
LOCAL_LDFLAGS := -Wl,--exclude-libs=libgcc.a LOCAL_LDFLAGS := -Wl,--exclude-libs=libgcc.a
# for x86, exclude libgcc_eh.a for the same reasons as above # for x86, exclude libgcc_eh.a for the same reasons as above
ifneq ($(TARGET_SIMULATOR),true)
ifeq ($(TARGET_ARCH),x86) ifeq ($(TARGET_ARCH),x86)
LOCAL_LDFLAGS += -Wl,--exclude-libs=libgcc_eh.a LOCAL_LDFLAGS += -Wl,--exclude-libs=libgcc_eh.a
endif endif
endif
LOCAL_SRC_FILES:= libdl.c LOCAL_SRC_FILES:= libdl.c