diff options
| author | Kenny Root | 2010-07-13 01:03:45 -0500 |
|---|---|---|
| committer | Kenny Root | 2010-07-13 01:03:45 -0500 |
| commit | bedaac52a677c152e051c17ef456cc9e43f3812b (patch) | |
| tree | 5ebe78b29eafeddb519d6b66f1e5d2841eebc6c6 /libdiskconfig | |
| parent | 07b3d09e841ea8544f72c3b2bf268f07df6357f7 (diff) | |
| download | platform-system-core-bedaac52a677c152e051c17ef456cc9e43f3812b.tar.gz platform-system-core-bedaac52a677c152e051c17ef456cc9e43f3812b.tar.xz platform-system-core-bedaac52a677c152e051c17ef456cc9e43f3812b.zip | |
Disable building libdiskconfig on non-Linux hosts
libdiskconfig depends deeply on some Linux-specific things like
/usr/include/linux/fs.h which don't exist on other OSes. Disable
building the host library for those platforms.
Change-Id: Ibccdfaa65be788f049ea3c1500f884c8d541e60b
Diffstat (limited to 'libdiskconfig')
| -rw-r--r-- | libdiskconfig/Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libdiskconfig/Android.mk b/libdiskconfig/Android.mk index ef08bec19..c887955ea 100644 --- a/libdiskconfig/Android.mk +++ b/libdiskconfig/Android.mk | |||
| @@ -3,7 +3,6 @@ include $(CLEAR_VARS) | |||
| 3 | 3 | ||
| 4 | ifneq ($(TARGET_SIMULATOR),true) | 4 | ifneq ($(TARGET_SIMULATOR),true) |
| 5 | 5 | ||
| 6 | |||
| 7 | commonSources := \ | 6 | commonSources := \ |
| 8 | diskconfig.c \ | 7 | diskconfig.c \ |
| 9 | diskutils.c \ | 8 | diskutils.c \ |
| @@ -16,13 +15,13 @@ LOCAL_MODULE := libdiskconfig | |||
| 16 | LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc | 15 | LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc |
| 17 | include $(BUILD_SHARED_LIBRARY) | 16 | include $(BUILD_SHARED_LIBRARY) |
| 18 | 17 | ||
| 18 | ifeq ($(HOST_OS),linux) | ||
| 19 | include $(CLEAR_VARS) | 19 | include $(CLEAR_VARS) |
| 20 | LOCAL_SRC_FILES := $(commonSources) | 20 | LOCAL_SRC_FILES := $(commonSources) |
| 21 | LOCAL_MODULE := libdiskconfig_host | 21 | LOCAL_MODULE := libdiskconfig_host |
| 22 | LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils | 22 | LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils |
| 23 | LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE | 23 | LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE |
| 24 | include $(BUILD_HOST_STATIC_LIBRARY) | 24 | include $(BUILD_HOST_STATIC_LIBRARY) |
| 25 | 25 | endif # HOST_OS == linux | |
| 26 | |||
| 27 | 26 | ||
| 28 | endif # ! TARGET_SIMULATOR | 27 | endif # ! TARGET_SIMULATOR |