commit 5bbf6dce9c09026a14a564a5e2c656a20913dec4
author qctecmdr <qctecmdr@localhost> Fri Nov 01 01:18:21 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Nov 01 01:18:21 2019 -0700
tree b505c8acbcf44d24bde30a9841f0982e98a28b0f
parent 45d5e47896807e0a9db193c24151ff3bcbf02dc3
parent 0d14688a7169aa8c9fa5ecd219dce405fcb826e5

Merge "display: Build composer in headless mode"

Android.mk

diff --git a/Android.mk b/Android.mk
index 3cca634..3471e0a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,11 +4,12 @@
 
 ifneq ($(TARGET_IS_HEADLESS), true)
     display-hals += libcopybit liblight libmemtrack hdmi_cec \
-                    composer gpu_tonemapper libdrmutils
+                    gpu_tonemapper libdrmutils
 endif
 
 display-hals += gralloc
 display-hals += sde-drm
+display-hals += composer
 
 ifeq ($(call is-vendor-board-platform,QCOM),true)
     include $(call all-named-subdir-makefiles,$(display-hals))

composer/Android.mk

diff --git a/composer/Android.mk b/composer/Android.mk
index f4ddbe5..a42e75c 100644
--- a/composer/Android.mk
+++ b/composer/Android.mk
@@ -2,9 +2,6 @@
 include $(LOCAL_PATH)/../common.mk
 include $(CLEAR_VARS)
 
-ifeq ($(use_hwc2),true)
-include $(CLEAR_VARS)
-
 LOCAL_MODULE                  := vendor.qti.hardware.display.composer-service
 LOCAL_SANITIZE                := integer_overflow
 LOCAL_VENDOR_MODULE           := true
@@ -24,7 +21,6 @@
                                  liblog libfmq libhardware_legacy \
                                  libsdmcore libqservice libqdutils libqdMetaData \
                                  libdisplaydebug libsdmutils libgrallocutils libui \
-                                 libgpu_tonemapper \
                                  libEGL libGLESv2 libGLESv3 \
                                  vendor.qti.hardware.display.composer@1.0 \
                                  vendor.qti.hardware.display.composer@2.0 \
@@ -50,6 +46,11 @@
                                  vendor.display.config@1.11 \
                                  vendor.display.config@1.12
 
+ifneq ($(TARGET_IS_HEADLESS), true)
+    LOCAL_SHARED_LIBRARIES += libgpu_tonemapper
+endif
+
+
 LOCAL_SRC_FILES               := QtiComposer.cpp QtiComposerClient.cpp service.cpp \
                                  QtiComposerHandleImporter.cpp \
                                  hwc_session.cpp \
@@ -81,4 +82,3 @@
 LOCAL_VINTF_FRAGMENTS         := vendor.qti.hardware.display.composer-service.xml
 
 include $(BUILD_EXECUTABLE)
-endif

composer/hwc_tonemapper.cpp

diff --git a/composer/hwc_tonemapper.cpp b/composer/hwc_tonemapper.cpp
index d417258..a88c06f 100644
--- a/composer/hwc_tonemapper.cpp
+++ b/composer/hwc_tonemapper.cpp
@@ -63,6 +63,7 @@
 void ToneMapSession::OnTask(const ToneMapTaskCode &task_code,
                             SyncTask<ToneMapTaskCode>::TaskContext *task_context) {
   switch (task_code) {
+#ifndef TARGET_HEADLESS
     case ToneMapTaskCode::kCodeGetInstance: {
         ToneMapGetInstanceContext *ctx = static_cast<ToneMapGetInstanceContext *>(task_context);
         Lut3d &lut_3d = ctx->layer->lut_3d;
@@ -95,6 +96,7 @@
       }
       break;
 
+#endif
     default:
       break;
   }

sdm/libs/core/Android.mk

diff --git a/sdm/libs/core/Android.mk b/sdm/libs/core/Android.mk
index 5840821..c6d6feb 100644
--- a/sdm/libs/core/Android.mk
+++ b/sdm/libs/core/Android.mk
@@ -10,11 +10,11 @@
 LOCAL_HEADER_LIBRARIES        := display_headers
 LOCAL_CFLAGS                  := -fno-operator-names -Wno-unused-parameter -DLOG_TAG=\"SDM\" \
                                  $(common_flags)
-LOCAL_SHARED_LIBRARIES        := libdl libdisplaydebug libsdmutils libsdedrm
+LOCAL_SHARED_LIBRARIES        := libdl libdisplaydebug libsdmutils
 
 ifneq ($(TARGET_IS_HEADLESS), true)
     LOCAL_CFLAGS              += -isystem external/libdrm
-    LOCAL_SHARED_LIBRARIES    += libdrm libdrmutils
+    LOCAL_SHARED_LIBRARIES    += libdrm libdrmutils libsdedrm
     LOCAL_HW_INTF_PATH_2      := drm
 endif