commit fc15f074ceee65a7b8618401cc2c0da47e30163a
author Arun Kumar K.R <akumarkr@codeaurora.org> Mon Dec 07 19:24:30 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Dec 15 18:51:15 2015 -0800
tree fa6b3542c2333d83fb569d4fdbe7ed36d367f7f7
parent 92c0b67be714f3ba04d0b1db193e15e7813f7f52

sdm: Enable QTI_BSP

- Enabling the QTI_BSP disables the rotation animation
  feature on secondary displays
- Remove unused HWC_DISPLAY_SECURE attribute

Crs-fixed: 949263
Change-Id: I39e22e3ec9b2350aa64be03eaf888aac708642ae

sdm/libs/hwc/Android.mk

diff --git a/sdm/libs/hwc/Android.mk b/sdm/libs/hwc/Android.mk
index 2455cfb..9f46328 100644
--- a/sdm/libs/hwc/Android.mk
+++ b/sdm/libs/hwc/Android.mk
@@ -21,6 +21,13 @@
     LOCAL_CFLAGS += -DMASTER_SIDE_CP
 endif
 
+
+ifeq ($(TARGET_USES_QCOM_BSP),true)
+# Enable QCOM Display features
+LOCAL_CFLAGS += -DQTI_BSP
+LOCAL_C_INCLUDES += vendor/qcom/opensource/display-frameworks/include
+endif
+
 LOCAL_SHARED_LIBRARIES        := libsdmcore libqservice libbinder libhardware libhardware_legacy \
                                  libutils libcutils libsync libmemalloc libqdutils libdl \
                                  libpowermanager libsdmutils libc++

sdm/libs/hwc/hwc_display.cpp

diff --git a/sdm/libs/hwc/hwc_display.cpp b/sdm/libs/hwc/hwc_display.cpp
index 706e549..f5784e9 100644
--- a/sdm/libs/hwc/hwc_display.cpp
+++ b/sdm/libs/hwc/hwc_display.cpp
@@ -41,6 +41,10 @@
 #include "hwc_debugger.h"
 #include "blit_engine_c2d.h"
 
+#ifdef QTI_BSP
+#include <exhwcomposer_defs.h>
+#endif
+
 #define __CLASS__ "HWCDisplay"
 
 namespace sdm {
@@ -241,11 +245,6 @@
     case HWC_DISPLAY_DPI_Y:
       values[i] = INT32(variable_config.y_dpi * 1000.0f);
       break;
-#ifdef QCOM_BSP
-    case HWC_DISPLAY_SECURE:
-      values[i] = INT32(true);  // For backward compatibility. All Physical displays are secure
-      break;
-#endif
     default:
       DLOGW("Spurious attribute type = %d", attributes[i]);
       return -EINVAL;
@@ -566,7 +565,7 @@
       LayerCache layer_cache = layer_stack_cache_.layer_cache[i];
       layer.flags.updating = IsLayerUpdating(hwc_layer, layer_cache);
     }
-#ifdef QCOM_BSP
+#ifdef QTI_BSP
     if (hwc_layer.flags & HWC_SCREENSHOT_ANIMATOR_LAYER) {
       layer_stack_.flags.animating = true;
     }