summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common.mk6
-rw-r--r--libcopybit/c2d2.h1
-rw-r--r--libhistogram/Android.mk1
-rw-r--r--libhistogram/histogram_collector.cpp1
-rw-r--r--liblight/Android.mk1
5 files changed, 7 insertions, 3 deletions
diff --git a/common.mk b/common.mk
index fdfd1fff..8e51dd6c 100644
--- a/common.mk
+++ b/common.mk
@@ -1,13 +1,13 @@
#Common headers
display_top := $(call my-dir)
display_config_version := $(shell \
- if [ -d "$(QC_OPEN_PATH)/interfaces/vendor/display/config/1.1" ];\
+ if [ -d "$(TOP)/vendor/qcom/opensource/interfaces/display/config/1.1" ];\
then echo DISPLAY_CONFIG_1_1; fi)
display_config_version := $(shell \
- if [ -d "$(QC_OPEN_PATH)/interfaces/vendor/display/config/1.2" ];\
+ if [ -d "$(TOP)/vendor/qcom/opensource/interfaces/display/config/1.2" ];\
then echo DISPLAY_CONFIG_1_2; fi)
display_config_version := $(shell \
- if [ -d "$(QC_OPEN_PATH)/interfaces/vendor/display/config/1.3" ];\
+ if [ -d "$(TOP)/vendor/qcom/opensource/interfaces/display/config/1.3" ];\
then echo DISPLAY_CONFIG_1_3; fi)
#Common C flags
diff --git a/libcopybit/c2d2.h b/libcopybit/c2d2.h
index 315a3ba5..821a6d57 100644
--- a/libcopybit/c2d2.h
+++ b/libcopybit/c2d2.h
@@ -207,6 +207,7 @@ typedef enum {
C2D_COLOR_FORMAT_422_Y42B = 174,
C2D_COLOR_FORMAT_800_Y800 = 190,
+ C2D_COLOR_FORMAT_420_TP10 = 191,
} C2D_YUV_FORMAT;
diff --git a/libhistogram/Android.mk b/libhistogram/Android.mk
index d67b2285..d9c92d01 100644
--- a/libhistogram/Android.mk
+++ b/libhistogram/Android.mk
@@ -16,6 +16,7 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_HEADER_LIBRARIES := display_headers
+LOCAL_HEADER_LIBRARIES += generated_kernel_headers
LOCAL_MODULE := libhistogram
LOCAL_SRC_FILES := histogram_collector.cpp ringbuffer.cpp
LOCAL_SHARED_LIBRARIES := libdrm.vendor liblog libcutils libutils
diff --git a/libhistogram/histogram_collector.cpp b/libhistogram/histogram_collector.cpp
index 868aaff5..aabd6edd 100644
--- a/libhistogram/histogram_collector.cpp
+++ b/libhistogram/histogram_collector.cpp
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#include <bits/epoll_event.h>
#include <chrono>
#include <ctime>
#include <iomanip>
diff --git a/liblight/Android.mk b/liblight/Android.mk
index d485c7e3..d205db41 100644
--- a/liblight/Android.mk
+++ b/liblight/Android.mk
@@ -20,6 +20,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := lights.c
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_HEADER_LIBRARIES := libhardware_headers
+LOCAL_HEADER_LIBRARIES += generated_kernel_headers
LOCAL_SHARED_LIBRARIES := liblog libcutils
LOCAL_CFLAGS := -DLOG_TAG=\"qdlights\"
ifeq ($(LLVM_SA), true)