diff options
author | Pullakavi Srinivas <spullaka@codeaurora.org> | 2016-06-22 02:20:07 +0530 |
---|---|---|
committer | Pullakavi Srinivas <spullaka@codeaurora.org> | 2016-07-01 16:20:31 +0530 |
commit | c6442669126c6373f6366cf67982714047f26cc0 (patch) | |
tree | f7ad349172e38514578be88ecf51e9613649c918 | |
parent | 6786e5d50eedc4865b193117e6475967de711e79 (diff) | |
download | display-c6442669126c6373f6366cf67982714047f26cc0.tar.gz |
display-hal: Exclude HWC libs compilation.
This change introduces compilation flag to
compile standalone SDM libs.
Change-Id: I3f8cde50e1806c6cf157364657d77fd9a780d5e3
-rw-r--r-- | Android.mk | 13 | ||||
-rw-r--r-- | common.mk | 17 | ||||
-rw-r--r-- | libgralloc/Android.mk | 8 | ||||
-rw-r--r-- | libgralloc/alloc_controller.cpp | 2 | ||||
-rw-r--r-- | libgralloc/framebuffer.cpp | 4 | ||||
-rw-r--r-- | liblight/Android.mk | 2 | ||||
-rw-r--r-- | libqdutils/Android.mk | 5 | ||||
-rw-r--r-- | libqservice/Android.mk | 1 | ||||
-rw-r--r-- | sdm/include/utils/sys.h | 4 | ||||
-rw-r--r-- | sdm/libs/core/Android.mk | 7 | ||||
-rw-r--r-- | sdm/libs/utils/Android.mk | 5 |
11 files changed, 42 insertions, 26 deletions
@@ -1,14 +1,17 @@ -display-hals := libcopybit liblight libmemtrack libqservice libqdutils +sdm-libs := sdm/libs +display-hals := libqservice libqdutils $(sdm-libs)/utils $(sdm-libs)/core + +ifneq ($(TARGET_IS_HEADLESS), true) + display-hals += libcopybit liblight libmemtrack hdmi_cec \ + $(sdm-libs)/hwc $(sdm-libs)/hwc2 +endif + ifneq ($(TARGET_USES_GRALLOC1), true) display-hals += libgralloc else display-hals += libgralloc1 endif -display-hals += hdmi_cec -sdm-libs := sdm/libs -display-hals += $(sdm-libs)/utils $(sdm-libs)/core $(sdm-libs)/hwc $(sdm-libs)/hwc2 - ifeq ($(call is-vendor-board-platform,QCOM),true) include $(call all-named-subdir-makefiles,$(display-hals)) else @@ -8,7 +8,10 @@ endif common_includes := $(display_top)/libqdutils common_includes += $(display_top)/libqservice -common_includes += $(display_top)/libcopybit +ifneq ($(TARGET_IS_HEADLESS), true) + common_includes += $(display_top)/libcopybit +endif + common_includes += $(display_top)/sdm/include common_header_export_path := qcom/display @@ -16,9 +19,15 @@ common_header_export_path := qcom/display #Common libraries external to display HAL common_libs := liblog libutils libcutils libhardware +ifeq ($(TARGET_IS_HEADLESS), true) + LOCAL_CLANG := false +else + LOCAL_CLANG := true +endif + #Common C flags common_flags := -DDEBUG_CALC_FPS -Wno-missing-field-initializers -common_flags += -Wconversion -Wall -Werror +common_flags += -Wconversion -Wall -Werror -std=c++11 ifneq ($(TARGET_USES_GRALLOC1), true) common_flags += -isystem $(display_top)/libgralloc else @@ -51,6 +60,10 @@ kernel_includes := # common_flags += -DQTI_BSP # endif +ifeq ($(TARGET_IS_HEADLESS),true) + common_flags += -DTARGET_HEADLESS +endif + ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true) # This check is to pick the kernel headers from the right location. # If the macro above is defined, we make the assumption that we have the kernel diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk index 03da8140..5e499b3b 100644 --- a/libgralloc/Android.mk +++ b/libgralloc/Android.mk @@ -21,10 +21,11 @@ LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) -LOCAL_SHARED_LIBRARIES := $(common_libs) libmemalloc libqdMetaData -LOCAL_SHARED_LIBRARIES += libqdutils libGLESv1_CM +LOCAL_SHARED_LIBRARIES := $(common_libs) libmemalloc libqdMetaData libqdutils +ifneq ($(TARGET_IS_HEADLESS), true) +LOCAL_SHARED_LIBRARIES += libGLESv1_CM +endif LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgralloc\" -Wno-sign-conversion -LOCAL_CLANG := true LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps) LOCAL_SRC_FILES := gpu.cpp gralloc.cpp framebuffer.cpp mapper.cpp LOCAL_COPY_HEADERS_TO := $(common_header_export_path) @@ -40,7 +41,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libqdutils libdl LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdmemalloc\" -Wno-sign-conversion -LOCAL_CLANG := true LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps) LOCAL_SRC_FILES := ionalloc.cpp alloc_controller.cpp LOCAL_COPY_HEADERS := alloc_controller.h memalloc.h diff --git a/libgralloc/alloc_controller.cpp b/libgralloc/alloc_controller.cpp index e9cdc73f..eded50fe 100644 --- a/libgralloc/alloc_controller.cpp +++ b/libgralloc/alloc_controller.cpp @@ -39,7 +39,7 @@ #include <qdMetaData.h> #include <utils/Singleton.h> #include <utils/Mutex.h> - +#include <algorithm> #ifdef VENUS_COLOR_FORMAT #include <media/msm_media_info.h> diff --git a/libgralloc/framebuffer.cpp b/libgralloc/framebuffer.cpp index 5c297c1f..dd4842f2 100644 --- a/libgralloc/framebuffer.cpp +++ b/libgralloc/framebuffer.cpp @@ -34,7 +34,9 @@ #include <linux/fb.h> #include <linux/msm_mdp.h> +#ifndef TARGET_HEADLESS #include <GLES/gl.h> +#endif #include "gralloc_priv.h" #include "fb_priv.h" @@ -99,7 +101,9 @@ static int fb_compositionComplete(struct framebuffer_device_t* dev) if(!dev) { return -1; } +#ifndef TARGET_HEADLESS glFinish(); +#endif return 0; } diff --git a/liblight/Android.mk b/liblight/Android.mk index 8aff542c..ff4825ba 100644 --- a/liblight/Android.mk +++ b/liblight/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := lights.c LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SHARED_LIBRARIES := liblog -LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdlights\" +LOCAL_CFLAGS := -DLOG_TAG=\"qdlights\" LOCAL_CLANG := true LOCAL_MODULE := lights.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_TAGS := optional diff --git a/libqdutils/Android.mk b/libqdutils/Android.mk index f56f7746..db6509c9 100644 --- a/libqdutils/Android.mk +++ b/libqdutils/Android.mk @@ -4,10 +4,9 @@ include $(CLEAR_VARS) LOCAL_MODULE := libqdutils LOCAL_MODULE_TAGS := optional -LOCAL_SHARED_LIBRARIES := $(common_libs) libui libbinder libqservice +LOCAL_SHARED_LIBRARIES := $(common_libs) libbinder libqservice LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdutils\" -Wno-sign-conversion -LOCAL_CLANG := true LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) LOCAL_COPY_HEADERS_TO := $(common_header_export_path) LOCAL_COPY_HEADERS := display_config.h @@ -26,7 +25,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) LOCAL_SRC_FILES := qdMetaData.cpp LOCAL_CFLAGS := $(common_flags) -Wno-sign-conversion LOCAL_CFLAGS += -DLOG_TAG=\"DisplayMetaData\" -LOCAL_CLANG := true + LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libqdMetaData include $(BUILD_SHARED_LIBRARY) diff --git a/libqservice/Android.mk b/libqservice/Android.mk index 285afca6..5c1eaba4 100644 --- a/libqservice/Android.mk +++ b/libqservice/Android.mk @@ -7,7 +7,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libbinder LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdqservice\" -Wno-sign-conversion -LOCAL_CLANG := true LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) LOCAL_SRC_FILES := QService.cpp \ IQService.cpp \ diff --git a/sdm/include/utils/sys.h b/sdm/include/utils/sys.h index c06b7f8a..b90007a8 100644 --- a/sdm/include/utils/sys.h +++ b/sdm/include/utils/sys.h @@ -49,7 +49,11 @@ class Sys { #endif // Pointers to system calls which are either mapped to actual system call or virtual driver. +#ifdef TARGET_HEADLESS + typedef int (*ioctl)(int, unsigned long int, ...); // NOLINT +#else typedef int (*ioctl)(int, int, ...); +#endif typedef int (*open)(const char *, int, ...); typedef int (*close)(int); typedef int (*poll)(struct pollfd *, nfds_t, int); diff --git a/sdm/libs/core/Android.mk b/sdm/libs/core/Android.mk index 5e886833..08d81b48 100644 --- a/sdm/libs/core/Android.mk +++ b/sdm/libs/core/Android.mk @@ -5,12 +5,9 @@ include $(LOCAL_PATH)/../../../common.mk LOCAL_MODULE := libsdmcore LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) -LOCAL_CFLAGS := -Wno-missing-field-initializers -Wno-unused-parameter \ - -std=c++11 -fcolor-diagnostics\ - -DLOG_TAG=\"SDM\" $(common_flags) -LOCAL_CLANG := true +LOCAL_CFLAGS := -Wno-unused-parameter -DLOG_TAG=\"SDM\" $(common_flags) LOCAL_HW_INTF_PATH := fb -LOCAL_SHARED_LIBRARIES := libdl libsdmutils libc++ +LOCAL_SHARED_LIBRARIES := libdl libsdmutils LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps) LOCAL_SRC_FILES := core_interface.cpp \ core_impl.cpp \ diff --git a/sdm/libs/utils/Android.mk b/sdm/libs/utils/Android.mk index f482a6d6..928f3c46 100644 --- a/sdm/libs/utils/Android.mk +++ b/sdm/libs/utils/Android.mk @@ -5,10 +5,7 @@ include $(LOCAL_PATH)/../../../common.mk LOCAL_MODULE := libsdmutils LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) -LOCAL_CFLAGS := -Wno-missing-field-initializers \ - -std=c++11 -fcolor-diagnostics\ - -DLOG_TAG=\"SDM\" $(common_flags) -LOCAL_CLANG := true +LOCAL_CFLAGS := -DLOG_TAG=\"SDM\" $(common_flags) LOCAL_SRC_FILES := debug.cpp \ rect.cpp \ sys.cpp \ |