Legacify and update for 4.3

Daz Jones · Daz Jones · commit 5db15b856723 · 2013-10-19T16:45:29.000+01:00
diff --git a/Android.mk b/Android.mk
@@ -1,16 +1,16 @@
 #Enables the listed display HAL modules
 #libs to be built for QCOM targets only
 
-ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
+ifeq ($(TARGET_QCOM_DISPLAY_VARIANT),legacy)
+
 display-hals := libgralloc libgenlock libcopybit
 display-hals += libhwcomposer liboverlay libqdutils
+display-hals += libtilerenderer
 
 ifneq ($(TARGET_PROVIDES_LIBLIGHTS),true)
 display-hals += liblight
 endif
 
-endif
-
-display-hals += libtilerenderer
-
 include $(call all-named-subdir-makefiles,$(display-hals))
+
+endif
diff --git a/common.mk b/common.mk
@@ -1,9 +1,9 @@
 #Common headers
-common_includes := hardware/qcom/display/libgralloc
-common_includes += hardware/qcom/display/libgenlock
-common_includes += hardware/qcom/display/liboverlay
-common_includes += hardware/qcom/display/libcopybit
-common_includes += hardware/qcom/display/libqdutils
+common_includes := hardware/qcom/display-legacy/libgralloc
+common_includes += hardware/qcom/display-legacy/libgenlock
+common_includes += hardware/qcom/display-legacy/liboverlay
+common_includes += hardware/qcom/display-legacy/libcopybit
+common_includes += hardware/qcom/display-legacy/libqdutils
 
 ifeq ($(TARGET_USES_POST_PROCESSING),true)
     common_flags     += -DUSES_POST_PROCESSING
diff --git a/libgralloc/alloc_controller.cpp b/libgralloc/alloc_controller.cpp
@@ -39,6 +39,8 @@
 #include "gr.h"
 #include "comptype.h"
 
+ANDROID_SINGLETON_STATIC_INSTANCE(qdutils::QCCompositionType);
+
 using namespace gralloc;
 using namespace qdutils;
 using android::sp;
diff --git a/libgralloc/framebuffer.cpp b/libgralloc/framebuffer.cpp
@@ -316,7 +316,12 @@ int mapFrameBufferLocked(struct private_module_t* module)
     float xdpi = (info.xres * 25.4f) / info.width;
     float ydpi = (info.yres * 25.4f) / info.height;
     //The reserved[4] field is used to store FPS by the driver.
+#ifndef REFRESH_RATE
     float fps  = info.reserved[4];
+#else
+    float fps = REFRESH_RATE;
+#warning "refresh rate set via makefile to REFRESH_RATE"
+#endif
 
     ALOGI("using (fd=%d)\n"
           "id           = %s\n"
diff --git a/libgralloc/gralloc.cpp b/libgralloc/gralloc.cpp
@@ -82,7 +82,6 @@ base: {
     lock: gralloc_lock,
     unlock: gralloc_unlock,
     perform: gralloc_perform,
-    reserved_proc: {0},
       },
 framebuffer: 0,
 fbFormat: 0,
diff --git a/libgralloc/gralloc_priv.h b/libgralloc/gralloc_priv.h
@@ -72,6 +72,9 @@ enum {
      */
     GRALLOC_USAGE_PRIVATE_UNSYNCHRONIZED  =       0X04000000,
 
+    /* Buffer content should be displayed on an primary display only */
+    GRALLOC_USAGE_PRIVATE_INTERNAL_ONLY   =       0x04000000,
+
     /* Buffer content should be displayed on an external display only */
     GRALLOC_USAGE_PRIVATE_EXTERNAL_ONLY   =       0x08000000,
 
diff --git a/libqdutils/Android.mk b/libqdutils/Android.mk
@@ -5,8 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE                  := libqdutils
 LOCAL_MODULE_TAGS             := optional
 LOCAL_SHARED_LIBRARIES        := $(common_libs) libdl libui libcutils
-LOCAL_C_INCLUDES              += $(TOP)/hardware/qcom/display/libhwcomposer
-LOCAL_C_INCLUDES              += $(TOP)/hardware/qcom/display/libgralloc
+LOCAL_C_INCLUDES              += $(TOP)/hardware/qcom/display-legacy/libhwcomposer
+LOCAL_C_INCLUDES              += $(TOP)/hardware/qcom/display-legacy/libgralloc
 
 LOCAL_CFLAGS                  := $(common_flags)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
diff --git a/libqdutils/comptype.h b/libqdutils/comptype.h
@@ -90,5 +90,4 @@ inline QCCompositionType::QCCompositionType()
 
 }
 }; //namespace qdutils
-ANDROID_SINGLETON_STATIC_INSTANCE(qdutils::QCCompositionType);
 #endif //INCLUDE_LIBQCOM_COMPTYPES

Original file line number	Diff line number	Diff line change
`@@ -90,5 +90,4 @@ inline QCCompositionType::QCCompositionType()`
`90`	`90`
`91`	`91`	`}`
`92`	`92`	`}; //namespace qdutils`
`93`		`-ANDROID_SINGLETON_STATIC_INSTANCE(qdutils::QCCompositionType);`
`94`	`93`	`#endif //INCLUDE_LIBQCOM_COMPTYPES`