commit 0d14688a7169aa8c9fa5ecd219dce405fcb826e5
author Naseer Ahmed <naseer@codeaurora.org> Fri Oct 18 15:19:43 2019 -0400
committer Naseer Ahmed <naseer@codeaurora.org> Mon Oct 28 12:45:03 2019 -0400
tree 2386e65e3eac2a104db769a52d9dac52a2917049
parent c530a968775c31a79e6ee8156b7151e904cf2b32

display: Build composer in headless mode

Change-Id: I4d10b71fd6ddf35361899bde91b554cda196bbb8

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;
   }