diff options
| -rw-r--r-- | Android.mk | 11 | ||||
| -rw-r--r-- | libgralloc/alloc_controller.cpp | 2 | ||||
| -rw-r--r-- | libgralloc/framebuffer.cpp | 2 | ||||
| -rw-r--r-- | libgralloc/gpu.h | 2 | ||||
| -rw-r--r-- | libgralloc/ionalloc.cpp | 2 | ||||
| -rw-r--r-- | libgralloc/mapper.cpp | 2 |
6 files changed, 12 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk index 80d5f462d..62cca6de6 100644 --- a/Android.mk +++ b/Android.mk @@ -1,7 +1,10 @@ -ifneq ($(filter msm8960,$(TARGET_BOARD_PLATFORM)),) - -display-hals := libgralloc libgenlock libcopybit liblight +ifeq ($(call is-vendor-board-platform,QCOM),true) +ifeq ($(TARGET_QCOM_DISPLAY_VARIANT),) +display-hals := libgralloc libgenlock libcopybit display-hals += libhwcomposer liboverlay libqdutils libexternal libqservice - +ifneq ($(TARGET_PROVIDES_LIBLIGHT),true) +display-hals += liblight +endif include $(call all-named-subdir-makefiles,$(display-hals)) endif +endif diff --git a/libgralloc/alloc_controller.cpp b/libgralloc/alloc_controller.cpp index e4d1d689d..6bc23de25 100644 --- a/libgralloc/alloc_controller.cpp +++ b/libgralloc/alloc_controller.cpp @@ -29,7 +29,7 @@ #include <cutils/log.h> #include <fcntl.h> -#include "gralloc_priv.h" +#include <gralloc_priv.h> #include "alloc_controller.h" #include "memalloc.h" #include "ionalloc.h" diff --git a/libgralloc/framebuffer.cpp b/libgralloc/framebuffer.cpp index 57df5b169..948cf1961 100644 --- a/libgralloc/framebuffer.cpp +++ b/libgralloc/framebuffer.cpp @@ -36,7 +36,7 @@ #include <GLES/gl.h> -#include "gralloc_priv.h" +#include <gralloc_priv.h> #include "fb_priv.h" #include "gr.h" #include <genlock.h> diff --git a/libgralloc/gpu.h b/libgralloc/gpu.h index 2920d5f5e..e4180f93b 100644 --- a/libgralloc/gpu.h +++ b/libgralloc/gpu.h @@ -26,7 +26,7 @@ #include <cutils/log.h> #include <cutils/ashmem.h> -#include "gralloc_priv.h" +#include <gralloc_priv.h> #include <fb_priv.h> namespace gralloc { diff --git a/libgralloc/ionalloc.cpp b/libgralloc/ionalloc.cpp index 8af5a96ba..76db49e8c 100644 --- a/libgralloc/ionalloc.cpp +++ b/libgralloc/ionalloc.cpp @@ -34,7 +34,7 @@ #include <fcntl.h> #include <cutils/log.h> #include <errno.h> -#include "gralloc_priv.h" +#include <gralloc_priv.h> #include "ionalloc.h" using gralloc::IonAlloc; diff --git a/libgralloc/mapper.cpp b/libgralloc/mapper.cpp index 3088ecc72..4e33d86dd 100644 --- a/libgralloc/mapper.cpp +++ b/libgralloc/mapper.cpp @@ -38,7 +38,7 @@ #include <linux/android_pmem.h> -#include "gralloc_priv.h" +#include <gralloc_priv.h> #include "gr.h" #include "alloc_controller.h" #include "memalloc.h" |