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 /libgralloc | |
| 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
Diffstat (limited to 'libgralloc')
| -rw-r--r-- | libgralloc/Android.mk | 8 | ||||
| -rw-r--r-- | libgralloc/alloc_controller.cpp | 2 | ||||
| -rw-r--r-- | libgralloc/framebuffer.cpp | 4 |
3 files changed, 9 insertions, 5 deletions
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; } |