diff options
| author | Naseer Ahmed <naseer@codeaurora.org> | 2017-03-31 16:49:05 -0400 |
|---|---|---|
| committer | Naseer Ahmed <naseer@codeaurora.org> | 2017-03-31 17:20:45 -0400 |
| commit | 5ef09d98d9a3d07e616d12d57713aa523686c056 (patch) | |
| tree | a6e9070e2fcdd1e6d802ef1057391d3d75059ffe | |
| parent | ffb4b396ed2ed2a51a478daa8b1635d0a0ccbfe0 (diff) | |
| download | display-5ef09d98d9a3d07e616d12d57713aa523686c056.tar.gz | |
display: Makefile fixes
* Add dependencies in gpu tonemapper
* Fix compile for hwc1 and gralloc1
CRs-Fixed: 2027609
Change-Id: I0f4303d8ea85d93be753e0031bcc3447ba407824
| -rw-r--r-- | gpu_tonemapper/Android.mk | 1 | ||||
| -rw-r--r-- | include/Android.mk | 1 | ||||
| -rw-r--r-- | libgralloc/Android.mk | 2 | ||||
| -rw-r--r-- | sdm/libs/hwc/Android.mk | 8 | ||||
| -rw-r--r-- | sdm/libs/hwc/hwc_display.cpp | 2 | ||||
| -rw-r--r-- | sdm/libs/hwc/hwc_display_external_test.cpp | 2 |
6 files changed, 12 insertions, 4 deletions
diff --git a/gpu_tonemapper/Android.mk b/gpu_tonemapper/Android.mk index 2d10319f..6af401ee 100644 --- a/gpu_tonemapper/Android.mk +++ b/gpu_tonemapper/Android.mk @@ -18,6 +18,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/qcom/display/ LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include LOCAL_SHARED_LIBRARIES := libEGL libGLESv2 libui libutils liblog +LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps) LOCAL_CFLAGS := $(version_flag) -Wno-missing-field-initializers -Wall \ -Wno-unused-parameter -std=c++11 -DLOG_TAG=\"GPU_TONEMAPPER\" diff --git a/include/Android.mk b/include/Android.mk index 95c5d25f..ec07ddee 100644 --- a/include/Android.mk +++ b/include/Android.mk @@ -15,6 +15,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) \ $(display_top)/libdrmutils \ $(display_top)/libqdutils \ $(display_top)/libqservice \ + $(display_top)/gpu_tonemapper \ $(display_top)/sdm/include ifeq ($(TARGET_USES_GRALLOC1), true) diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk index 8d5dfd37..b9119993 100644 --- a/libgralloc/Android.mk +++ b/libgralloc/Android.mk @@ -27,6 +27,7 @@ endif LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) +LOCAL_HEADER_LIBRARIES := display_headers LOCAL_SHARED_LIBRARIES := $(common_libs) libmemalloc libqdMetaData libqdutils ifneq ($(TARGET_IS_HEADLESS), true) LOCAL_SHARED_LIBRARIES += libGLESv1_CM libdrmutils @@ -51,6 +52,7 @@ endif LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) +LOCAL_HEADER_LIBRARIES := display_headers LOCAL_SHARED_LIBRARIES := $(common_libs) libqdutils libdl LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdmemalloc\" -Wno-sign-conversion LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps) diff --git a/sdm/libs/hwc/Android.mk b/sdm/libs/hwc/Android.mk index 049f0f97..c3d906fb 100644 --- a/sdm/libs/hwc/Android.mk +++ b/sdm/libs/hwc/Android.mk @@ -13,16 +13,16 @@ endif LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) +LOCAL_HEADER_LIBRARIES := display_headers -LOCAL_CFLAGS := -Wno-missing-field-initializers -Wno-unused-parameter \ - -std=c++11 -fcolor-diagnostics\ - -DLOG_TAG=\"SDM\" $(common_flags) +LOCAL_CFLAGS := $(common_flags) -Wno-missing-field-initializers -Wno-unused-parameter \ + -std=c++11 -fcolor-diagnostics -Wno-sign-conversion -DLOG_TAG=\"SDM\" LOCAL_CLANG := true LOCAL_SHARED_LIBRARIES := libsdmcore libqservice libbinder libhardware libhardware_legacy \ libutils libcutils libsync libmemalloc libqdutils libdl \ libpowermanager libsdmutils libgpu_tonemapper libc++ liblog \ - libdrmutils + libdrmutils libui LOCAL_SRC_FILES := hwc_session.cpp \ hwc_display.cpp \ diff --git a/sdm/libs/hwc/hwc_display.cpp b/sdm/libs/hwc/hwc_display.cpp index 5940faff..17b4b99f 100644 --- a/sdm/libs/hwc/hwc_display.cpp +++ b/sdm/libs/hwc/hwc_display.cpp @@ -35,6 +35,8 @@ #include <utils/formats.h> #include <utils/rect.h> #include <utils/debug.h> +#include <sys/types.h> +#include <sys/stat.h> #include <sync/sync.h> #include <cutils/properties.h> #include <qd_utils.h> diff --git a/sdm/libs/hwc/hwc_display_external_test.cpp b/sdm/libs/hwc/hwc_display_external_test.cpp index acbf4e0e..e629cd61 100644 --- a/sdm/libs/hwc/hwc_display_external_test.cpp +++ b/sdm/libs/hwc/hwc_display_external_test.cpp @@ -29,6 +29,8 @@ #include <cutils/properties.h> #include <sys/mman.h> +#include <sys/types.h> +#include <sys/stat.h> #include <utils/constants.h> #include <utils/debug.h> #include <utils/formats.h> |