Merge "may fix the build"

This commit is contained in:
Mathias Agopian 2011-09-28 17:34:12 -07:00 committed by Android (Google) Code Review
commit 1c1804afab

View File

@ -100,12 +100,8 @@ LOCAL_LDLIBS += -lpthread
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libz \ libz \
liblog \ liblog \
libcutils libcutils \
libdl
ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-x86)
# This is needed on x86 to bring in dl_iterate_phdr for CallStack.cpp
LOCAL_SHARED_LIBRARIES += libdl
endif # linux-x86
LOCAL_MODULE:= libutils LOCAL_MODULE:= libutils
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)