ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Move libdiskconfig headers into libdiskconfig."

Browse source
This commit is contained in:
Elliott Hughes 2016-02-16 18:34:24 +00:00 • committed by Gerrit Code Review
commit 737325fb7c
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libdiskconfig/Android.mk
View file

@ -13,6 +13,8 @@ LOCAL_MODULE := libdiskconfig
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc
LOCAL_CFLAGS := -Werror LOCAL_CFLAGS := -Werror
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
@ -21,5 +23,7 @@ LOCAL_SRC_FILES := $(commonSources)
LOCAL_MODULE := libdiskconfig_host LOCAL_MODULE := libdiskconfig_host
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)
endif # HOST_OS == linux endif # HOST_OS == linux

0
include/diskconfig/diskconfig.h → libdiskconfig/include/diskconfig/diskconfig.h
View file