Merge "display-hal: Exclude HWC libs compilation."
This commit is contained in:
committed by
Gerrit - the friendly Code Review server
commit
8598d1e49e
13
Android.mk
13
Android.mk
@@ -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)
|
ifneq ($(TARGET_USES_GRALLOC1), true)
|
||||||
display-hals += libgralloc
|
display-hals += libgralloc
|
||||||
else
|
else
|
||||||
display-hals += libgralloc1
|
display-hals += libgralloc1
|
||||||
endif
|
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)
|
ifeq ($(call is-vendor-board-platform,QCOM),true)
|
||||||
include $(call all-named-subdir-makefiles,$(display-hals))
|
include $(call all-named-subdir-makefiles,$(display-hals))
|
||||||
else
|
else
|
||||||
|
|||||||
17
common.mk
17
common.mk
@@ -8,7 +8,10 @@ endif
|
|||||||
|
|
||||||
common_includes := $(display_top)/libqdutils
|
common_includes := $(display_top)/libqdutils
|
||||||
common_includes += $(display_top)/libqservice
|
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_includes += $(display_top)/sdm/include
|
||||||
|
|
||||||
common_header_export_path := qcom/display
|
common_header_export_path := qcom/display
|
||||||
@@ -16,9 +19,15 @@ common_header_export_path := qcom/display
|
|||||||
#Common libraries external to display HAL
|
#Common libraries external to display HAL
|
||||||
common_libs := liblog libutils libcutils libhardware
|
common_libs := liblog libutils libcutils libhardware
|
||||||
|
|
||||||
|
ifeq ($(TARGET_IS_HEADLESS), true)
|
||||||
|
LOCAL_CLANG := false
|
||||||
|
else
|
||||||
|
LOCAL_CLANG := true
|
||||||
|
endif
|
||||||
|
|
||||||
#Common C flags
|
#Common C flags
|
||||||
common_flags := -DDEBUG_CALC_FPS -Wno-missing-field-initializers
|
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)
|
ifneq ($(TARGET_USES_GRALLOC1), true)
|
||||||
common_flags += -isystem $(display_top)/libgralloc
|
common_flags += -isystem $(display_top)/libgralloc
|
||||||
else
|
else
|
||||||
@@ -51,6 +60,10 @@ kernel_includes :=
|
|||||||
# common_flags += -DQTI_BSP
|
# common_flags += -DQTI_BSP
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
ifeq ($(TARGET_IS_HEADLESS),true)
|
||||||
|
common_flags += -DTARGET_HEADLESS
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)
|
ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)
|
||||||
# This check is to pick the kernel headers from the right location.
|
# 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
|
# If the macro above is defined, we make the assumption that we have the kernel
|
||||||
|
|||||||
@@ -21,10 +21,11 @@ LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM)
|
|||||||
LOCAL_MODULE_RELATIVE_PATH := hw
|
LOCAL_MODULE_RELATIVE_PATH := hw
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
|
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
|
||||||
LOCAL_SHARED_LIBRARIES := $(common_libs) libmemalloc libqdMetaData
|
LOCAL_SHARED_LIBRARIES := $(common_libs) libmemalloc libqdMetaData libqdutils
|
||||||
LOCAL_SHARED_LIBRARIES += libqdutils libGLESv1_CM
|
ifneq ($(TARGET_IS_HEADLESS), true)
|
||||||
|
LOCAL_SHARED_LIBRARIES += libGLESv1_CM
|
||||||
|
endif
|
||||||
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgralloc\" -Wno-sign-conversion
|
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgralloc\" -Wno-sign-conversion
|
||||||
LOCAL_CLANG := true
|
|
||||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
|
||||||
LOCAL_SRC_FILES := gpu.cpp gralloc.cpp framebuffer.cpp mapper.cpp
|
LOCAL_SRC_FILES := gpu.cpp gralloc.cpp framebuffer.cpp mapper.cpp
|
||||||
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
|
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
|
||||||
@@ -40,7 +41,6 @@ LOCAL_MODULE_TAGS := optional
|
|||||||
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
|
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
|
||||||
LOCAL_SHARED_LIBRARIES := $(common_libs) libqdutils libdl
|
LOCAL_SHARED_LIBRARIES := $(common_libs) libqdutils libdl
|
||||||
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdmemalloc\" -Wno-sign-conversion
|
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdmemalloc\" -Wno-sign-conversion
|
||||||
LOCAL_CLANG := true
|
|
||||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
|
||||||
LOCAL_SRC_FILES := ionalloc.cpp alloc_controller.cpp
|
LOCAL_SRC_FILES := ionalloc.cpp alloc_controller.cpp
|
||||||
LOCAL_COPY_HEADERS := alloc_controller.h memalloc.h
|
LOCAL_COPY_HEADERS := alloc_controller.h memalloc.h
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
#include <qdMetaData.h>
|
#include <qdMetaData.h>
|
||||||
#include <utils/Singleton.h>
|
#include <utils/Singleton.h>
|
||||||
#include <utils/Mutex.h>
|
#include <utils/Mutex.h>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
#ifdef VENUS_COLOR_FORMAT
|
#ifdef VENUS_COLOR_FORMAT
|
||||||
#include <media/msm_media_info.h>
|
#include <media/msm_media_info.h>
|
||||||
|
|||||||
@@ -34,7 +34,9 @@
|
|||||||
#include <linux/fb.h>
|
#include <linux/fb.h>
|
||||||
#include <linux/msm_mdp.h>
|
#include <linux/msm_mdp.h>
|
||||||
|
|
||||||
|
#ifndef TARGET_HEADLESS
|
||||||
#include <GLES/gl.h>
|
#include <GLES/gl.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "gralloc_priv.h"
|
#include "gralloc_priv.h"
|
||||||
#include "fb_priv.h"
|
#include "fb_priv.h"
|
||||||
@@ -99,7 +101,9 @@ static int fb_compositionComplete(struct framebuffer_device_t* dev)
|
|||||||
if(!dev) {
|
if(!dev) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
#ifndef TARGET_HEADLESS
|
||||||
glFinish();
|
glFinish();
|
||||||
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ include $(CLEAR_VARS)
|
|||||||
LOCAL_SRC_FILES := lights.c
|
LOCAL_SRC_FILES := lights.c
|
||||||
LOCAL_MODULE_RELATIVE_PATH := hw
|
LOCAL_MODULE_RELATIVE_PATH := hw
|
||||||
LOCAL_SHARED_LIBRARIES := liblog
|
LOCAL_SHARED_LIBRARIES := liblog
|
||||||
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdlights\"
|
LOCAL_CFLAGS := -DLOG_TAG=\"qdlights\"
|
||||||
LOCAL_CLANG := true
|
LOCAL_CLANG := true
|
||||||
LOCAL_MODULE := lights.$(TARGET_BOARD_PLATFORM)
|
LOCAL_MODULE := lights.$(TARGET_BOARD_PLATFORM)
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
|
|||||||
@@ -4,10 +4,9 @@ include $(CLEAR_VARS)
|
|||||||
|
|
||||||
LOCAL_MODULE := libqdutils
|
LOCAL_MODULE := libqdutils
|
||||||
LOCAL_MODULE_TAGS := optional
|
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_C_INCLUDES := $(common_includes) $(kernel_includes)
|
||||||
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdutils\" -Wno-sign-conversion
|
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdutils\" -Wno-sign-conversion
|
||||||
LOCAL_CLANG := true
|
|
||||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
|
||||||
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
|
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
|
||||||
LOCAL_COPY_HEADERS := display_config.h
|
LOCAL_COPY_HEADERS := display_config.h
|
||||||
@@ -26,7 +25,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
|
|||||||
LOCAL_SRC_FILES := qdMetaData.cpp
|
LOCAL_SRC_FILES := qdMetaData.cpp
|
||||||
LOCAL_CFLAGS := $(common_flags) -Wno-sign-conversion
|
LOCAL_CFLAGS := $(common_flags) -Wno-sign-conversion
|
||||||
LOCAL_CFLAGS += -DLOG_TAG=\"DisplayMetaData\"
|
LOCAL_CFLAGS += -DLOG_TAG=\"DisplayMetaData\"
|
||||||
LOCAL_CLANG := true
|
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
LOCAL_MODULE := libqdMetaData
|
LOCAL_MODULE := libqdMetaData
|
||||||
include $(BUILD_SHARED_LIBRARY)
|
include $(BUILD_SHARED_LIBRARY)
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ LOCAL_MODULE_TAGS := optional
|
|||||||
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
|
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
|
||||||
LOCAL_SHARED_LIBRARIES := $(common_libs) libbinder
|
LOCAL_SHARED_LIBRARIES := $(common_libs) libbinder
|
||||||
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdqservice\" -Wno-sign-conversion
|
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdqservice\" -Wno-sign-conversion
|
||||||
LOCAL_CLANG := true
|
|
||||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
|
||||||
LOCAL_SRC_FILES := QService.cpp \
|
LOCAL_SRC_FILES := QService.cpp \
|
||||||
IQService.cpp \
|
IQService.cpp \
|
||||||
|
|||||||
@@ -49,7 +49,11 @@ class Sys {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Pointers to system calls which are either mapped to actual system call or virtual driver.
|
// 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, ...);
|
typedef int (*ioctl)(int, int, ...);
|
||||||
|
#endif
|
||||||
typedef int (*open)(const char *, int, ...);
|
typedef int (*open)(const char *, int, ...);
|
||||||
typedef int (*close)(int);
|
typedef int (*close)(int);
|
||||||
typedef int (*poll)(struct pollfd *, nfds_t, int);
|
typedef int (*poll)(struct pollfd *, nfds_t, int);
|
||||||
|
|||||||
@@ -5,12 +5,9 @@ include $(LOCAL_PATH)/../../../common.mk
|
|||||||
LOCAL_MODULE := libsdmcore
|
LOCAL_MODULE := libsdmcore
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
|
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
|
||||||
LOCAL_CFLAGS := -Wno-missing-field-initializers -Wno-unused-parameter \
|
LOCAL_CFLAGS := -Wno-unused-parameter -DLOG_TAG=\"SDM\" $(common_flags)
|
||||||
-std=c++11 -fcolor-diagnostics\
|
|
||||||
-DLOG_TAG=\"SDM\" $(common_flags)
|
|
||||||
LOCAL_CLANG := true
|
|
||||||
LOCAL_HW_INTF_PATH := fb
|
LOCAL_HW_INTF_PATH := fb
|
||||||
LOCAL_SHARED_LIBRARIES := libdl libsdmutils libc++
|
LOCAL_SHARED_LIBRARIES := libdl libsdmutils
|
||||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
|
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
|
||||||
LOCAL_SRC_FILES := core_interface.cpp \
|
LOCAL_SRC_FILES := core_interface.cpp \
|
||||||
core_impl.cpp \
|
core_impl.cpp \
|
||||||
|
|||||||
@@ -5,10 +5,7 @@ include $(LOCAL_PATH)/../../../common.mk
|
|||||||
LOCAL_MODULE := libsdmutils
|
LOCAL_MODULE := libsdmutils
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
LOCAL_C_INCLUDES := $(common_includes)
|
LOCAL_C_INCLUDES := $(common_includes)
|
||||||
LOCAL_CFLAGS := -Wno-missing-field-initializers \
|
LOCAL_CFLAGS := -DLOG_TAG=\"SDM\" $(common_flags)
|
||||||
-std=c++11 -fcolor-diagnostics\
|
|
||||||
-DLOG_TAG=\"SDM\" $(common_flags)
|
|
||||||
LOCAL_CLANG := true
|
|
||||||
LOCAL_SRC_FILES := debug.cpp \
|
LOCAL_SRC_FILES := debug.cpp \
|
||||||
rect.cpp \
|
rect.cpp \
|
||||||
sys.cpp \
|
sys.cpp \
|
||||||
|
|||||||
Reference in New Issue
Block a user