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

gralloc: Remove conditional inclusion of msm_media_info.h

Browse Source 
msm_media_info.h is conditionally included, but symbols within it
aren't. Since msm_media_info.h will always be available, remove
conditional inclusion.

Change-Id: I8e6cc8cb12899318e81a622b42f14e14fd0f9acb
This commit is contained in:
Saurabh Shah
2017-01-30 10:48:00 -08:00
parent fb580226c7
commit 2693a50c65
3 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common.mk
View File

@@ -52,10 +52,6 @@ ifeq ($(ARCH_ARM_HAVE_NEON),true)
common_flags += -D__ARM_HAVE_NEON common_flags += -D__ARM_HAVE_NEON
endif endif
ifeq ($(call is-board-platform-in-list, $(MSM_VIDC_TARGET_LIST)), true)
common_flags += -DVENUS_COLOR_FORMAT
endif
ifeq ($(call is-board-platform-in-list, $(MASTER_SIDE_CP_TARGET_LIST)), true) ifeq ($(call is-board-platform-in-list, $(MASTER_SIDE_CP_TARGET_LIST)), true)
common_flags += -DMASTER_SIDE_CP common_flags += -DMASTER_SIDE_CP
endif endif

18
libgralloc/alloc_controller.cpp
View File

@@ -30,24 +30,18 @@
#include <cutils/log.h> #include <cutils/log.h>
#include <fcntl.h> #include <fcntl.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <media/msm_media_info.h>
#include <qdMetaData.h>
#include <utils/Singleton.h>
#include <utils/Mutex.h>
#include <algorithm>
#include "gralloc_priv.h" #include "gralloc_priv.h"
#include "alloc_controller.h" #include "alloc_controller.h"
#include "memalloc.h" #include "memalloc.h"
#include "ionalloc.h" #include "ionalloc.h"
#include "gr.h" #include "gr.h"
#include "qd_utils.h" #include "qd_utils.h"
#include <qdMetaData.h>
#include <utils/Singleton.h>
#include <utils/Mutex.h>
#include <algorithm>
#ifdef VENUS_COLOR_FORMAT
#include <media/msm_media_info.h>
#else
#define VENUS_Y_STRIDE(args...) 0
#define VENUS_Y_SCANLINES(args...) 0
#define VENUS_BUFFER_SIZE(args...) 0
#endif
#define ASTC_BLOCK_SIZE 16 #define ASTC_BLOCK_SIZE 16

6
libgralloc1/gr_adreno_info.h
View File

@@ -30,13 +30,7 @@
#ifndef __GR_ADRENO_INFO_H__ #ifndef __GR_ADRENO_INFO_H__
#define __GR_ADRENO_INFO_H__ #define __GR_ADRENO_INFO_H__
#ifdef VENUS_COLOR_FORMAT
#include <media/msm_media_info.h> #include <media/msm_media_info.h>
#else
#define VENUS_Y_STRIDE(args...) 0
#define VENUS_Y_SCANLINES(args...) 0
#define VENUS_BUFFER_SIZE(args...) 0
#endif
namespace gralloc1 { namespace gralloc1 {