LineageOS/android_vendor_qcom_opensource_display-commonsys-intf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "display-hal: Exclude HWC libs compilation."

Browse Source
This commit is contained in:
Linux Build Service Account
2016-07-11 08:14:31 -07:00
committed by Gerrit - the friendly Code Review server
parent 410be19cc5 c644266912
commit 8598d1e49e
11 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Android.mk
View File

@@ -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

15
common.mk
View File

@@ -8,7 +8,10 @@ endif
common_includes := $(display_top)/libqdutils
common_includes += $(display_top)/libqservice
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

8
libgralloc/Android.mk
View File

@@ -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

2
libgralloc/alloc_controller.cpp
View File

@@ -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>

4
libgralloc/framebuffer.cpp
View File

@@ -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;
}

2
liblight/Android.mk
View File

@@ -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

5
libqdutils/Android.mk
View File

@@ -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)

1
libqservice/Android.mk
View File

@@ -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 \

4
sdm/include/utils/sys.h
View File

@@ -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);

7
sdm/libs/core/Android.mk
View File

@@ -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 \

5
sdm/libs/utils/Android.mk
View File

@@ -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 \