generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Remove the simulator target from all makefiles. Bug: 5010576"

Browse Source
This commit is contained in:
Jeff Brown
2011-07-12 12:11:19 -07:00
committed by Android (Google) Code Review
parent f733ca08e6 7e5d19c055
commit 22fc595bff
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Android.mk
View File

@@ -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)

2
libdl/Android.mk
View File

@@ -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