merge from open-source master

Change-Id: I308dce25270cffc5d1f0056e1e3d3a3fbc6be532
This commit is contained in:
The Android Open Source Project 2010-07-13 09:05:03 -07:00
commit 8e9cacc5eb

View file

@ -3,7 +3,6 @@ include $(CLEAR_VARS)
ifneq ($(TARGET_SIMULATOR),true)
commonSources := \
diskconfig.c \
diskutils.c \
@ -16,13 +15,13 @@ LOCAL_MODULE := libdiskconfig
LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc
include $(BUILD_SHARED_LIBRARY)
ifeq ($(HOST_OS),linux)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(commonSources)
LOCAL_MODULE := libdiskconfig_host
LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils
LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE
include $(BUILD_HOST_STATIC_LIBRARY)
endif # HOST_OS == linux
endif # ! TARGET_SIMULATOR