commit 5db1ebe0292a021ebb54c5981bc12bd6ee12eb7a
author The Android Open Source Project <initial-contribution@android.com> Tue Jul 13 09:10:22 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 13 09:10:22 2010 -0700
tree 1308819efeea3bbdbef19abd330659e5a2c4ed5e
parent 41b92c20f82d10291bd65d68111edafbf53a9471
parent 8e9cacc5eb1618b34373ac9131561560a56b4661

am 8e9cacc5: merge from open-source master

Merge commit '8e9cacc5eb1618b34373ac9131561560a56b4661'

* commit '8e9cacc5eb1618b34373ac9131561560a56b4661':
  Disable building libdiskconfig on non-Linux hosts

libdiskconfig/Android.mk

diff --git a/libdiskconfig/Android.mk b/libdiskconfig/Android.mk
index ef08bec..c887955 100644
--- a/libdiskconfig/Android.mk
+++ b/libdiskconfig/Android.mk
@@ -3,7 +3,6 @@
 
 ifneq ($(TARGET_SIMULATOR),true)
 
-
 commonSources := \
 	diskconfig.c \
 	diskutils.c \
@@ -16,13 +15,13 @@
 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