am 8e9cacc5: merge from open-source master
Merge commit '8e9cacc5eb1618b34373ac9131561560a56b4661' * commit '8e9cacc5eb1618b34373ac9131561560a56b4661': Disable building libdiskconfig on non-Linux hosts
This commit is contained in:
commit
5db1ebe029
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue