qcom/display: update mk for cm9

VillainMod · Mar 23, 2012 · c2cd57e · c2cd57e
1 parent 8fce0ff
commit c2cd57e
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 51 deletions.
diff --git a/Android.mk b/Android.mk
@@ -1,10 +1,8 @@
-#Enables the listed display HAL modules
-#Libs to be built for all targets (including SDK)
-display-hals := libqcomui libtilerenderer
-
 #libs to be built for QCOM targets only
-ifeq ($(call is-vendor-board-platform,QCOM),true)
-display-hals += libhwcomposer liboverlay libgralloc libgenlock libcopybit
+
+ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
+    display-hals := libqcomui libtilerenderer
+    display-hals += libhwcomposer liboverlay libgralloc libgenlock libcopybit
+    include $(call all-named-subdir-makefiles,$(display-hals))
 endif
 
-include $(call all-named-subdir-makefiles,$(display-hals))
diff --git a/libcopybit/Android.mk b/libcopybit/Android.mk
@@ -24,40 +24,34 @@ ifeq ($(TARGET_USES_C2D_COMPOSITION),true)
     LOCAL_SHARED_LIBRARIES := liblog libdl libcutils libmemalloc libutils
     LOCAL_SRC_FILES := copybit_c2d.cpp software_converter.cpp
     LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM)
-    LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-    LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
     LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
     LOCAL_CFLAGS += -DCOPYBIT_Z180=1 -DC2D_SUPPORT_DISPLAY=1
     LOCAL_MODULE_TAGS := optional
     include $(BUILD_SHARED_LIBRARY)
 else
-    ifneq ($(call is-chipset-in-board-platform,msm7630),true)
-        ifeq ($(call is-board-platform-in-list,$(MSM7K_BOARD_PLATFORMS)),true)
-            include $(CLEAR_VARS)
-            ifeq ($(ARCH_ARM_HAVE_NEON),true)
-                LOCAL_CFLAGS += -D__ARM_HAVE_NEON
-            endif
-            ifeq ($(call is-board-platform,msm7627a),true)
-                LOCAL_CFLAGS += -DTARGET_7x27A
-            endif
-            ifeq ($(TARGET_GRALLOC_USES_ASHMEM),true)
-                LOCAL_CFLAGS += -DUSE_ASHMEM
-                ifeq ($(call is-chipset-prefix-in-board-platform,msm7627),true)
-                   LOCAL_CFLAGS += -DTARGET_7x27
-                endif
+    ifneq ($(TARGET_BOARD_PLATFORM),msm7x30)
+        include $(CLEAR_VARS)
+        ifeq ($(ARCH_ARM_HAVE_NEON),true)
+            LOCAL_CFLAGS += -D__ARM_HAVE_NEON
+        endif
+        ifeq ($(TARGET_BOARD_PLATFORM),msm7x27a)
+            LOCAL_CFLAGS += -DTARGET_7x27A
+        endif
+        ifeq ($(TARGET_GRALLOC_USES_ASHMEM),true)
+            LOCAL_CFLAGS += -DUSE_ASHMEM
+            ifeq ($(TARGET_BOARD_PLATFORM),msm7x27)
+               LOCAL_CFLAGS += -DTARGET_7x27
             endif
-
-            LOCAL_PRELINK_MODULE := false
-            LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
-            LOCAL_SHARED_LIBRARIES := liblog libmemalloc
-            LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
-            LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM)
-            LOCAL_MODULE_TAGS := optional
-            LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-            LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
-            LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
-            LOCAL_CFLAGS += -DCOPYBIT_MSM7K=1
-            include $(BUILD_SHARED_LIBRARY)
         endif
+
+        LOCAL_PRELINK_MODULE := false
+        LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+        LOCAL_SHARED_LIBRARIES := liblog libmemalloc
+        LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
+        LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM)
+        LOCAL_MODULE_TAGS := optional
+        LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
+        LOCAL_CFLAGS += -DCOPYBIT_MSM7K=1
+        include $(BUILD_SHARED_LIBRARY)
     endif
 endif
diff --git a/libgenlock/Android.mk b/libgenlock/Android.mk
@@ -4,12 +4,9 @@ include $(CLEAR_VARS)
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
 LOCAL_SHARED_LIBRARIES := liblog libcutils
-LOCAL_C_INCLUDES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
-LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+LOCAL_C_INCLUDES := hardware/qcom/display/libgralloc
 LOCAL_SRC_FILES := genlock.cpp
 LOCAL_CFLAGS:= -DLOG_TAG=\"libgenlock\"
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libgenlock
 include $(BUILD_SHARED_LIBRARY)
-
diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk
@@ -23,10 +23,8 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 LOCAL_SHARED_LIBRARIES := liblog libcutils libGLESv1_CM libutils libmemalloc libQcomUI
 LOCAL_SHARED_LIBRARIES += libgenlock
 
-LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_C_INCLUDES += hardware/qcom/display/libgenlock
 LOCAL_C_INCLUDES += hardware/qcom/display/libqcomui
-LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 LOCAL_SRC_FILES :=  framebuffer.cpp \
                     gpu.cpp         \
                     gralloc.cpp     \
@@ -35,13 +33,14 @@ LOCAL_SRC_FILES :=  framebuffer.cpp \
 LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM)
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS:= -DLOG_TAG=\"$(TARGET_BOARD_PLATFORM).gralloc\" -DHOST -DDEBUG_CALC_FPS
+LOCAL_CFLAGS += -DQCOM_HARDWARE
 
 ifeq ($(call is-board-platform,msm7627_surf msm7627_6x),true)
     LOCAL_CFLAGS += -DTARGET_MSM7x27
 endif
 
 ifeq ($(TARGET_HAVE_HDMI_OUT),true)
-    LOCAL_CFLAGS += -DHDMI_DUAL_DISPLAY
+    LOCAL_CFLAGS += -DHDMI_DUAL_DISPLAY -DQCOM_HDMI_OUT
     LOCAL_C_INCLUDES += hardware/qcom/display/liboverlay
     LOCAL_SHARED_LIBRARIES += liboverlay
 endif
@@ -60,8 +59,6 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
-LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 LOCAL_SHARED_LIBRARIES := liblog libcutils libutils
 LOCAL_SRC_FILES :=  ionalloc.cpp \
                     ashmemalloc.cpp \

diff --git a/libgralloc/ionalloc.cpp b/libgralloc/ionalloc.cpp
@@ -84,7 +84,7 @@ int IonAlloc::alloc_buffer(alloc_data& data)
     if(data.uncached) {
         // Use the sync FD to alloc and map
         // when we need uncached memory
-        ionSyncFd = open(ION_DEVICE, O_RDONLY|O_DSYNC);
+        ionSyncFd = open(ION_DEVICE, O_RDONLY|O_SYNC);
         if(ionSyncFd < 0) {
             LOGE("%s: Failed to open ion device - %s",
                     __FUNCTION__, strerror(errno));

diff --git a/libhwcomposer/Android.mk b/libhwcomposer/Android.mk
@@ -14,15 +14,14 @@ LOCAL_SRC_FILES := 	\
 
 LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM)
 LOCAL_CFLAGS:= -DLOG_TAG=\"$(TARGET_BOARD_PLATFORM).hwcomposer\" -DDEBUG_CALC_FPS
+LOCAL_CFLAGS += -DQCOM_HARDWARE
 
 LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
 LOCAL_C_INCLUDES += hardware/qcom/display/liboverlay
 LOCAL_C_INCLUDES += hardware/qcom/display/libcopybit
 LOCAL_C_INCLUDES += hardware/qcom/display/libgenlock
 LOCAL_C_INCLUDES += hardware/qcom/display/libqcomui
-LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 
-LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 ifeq ($(TARGET_HAVE_HDMI_OUT),true)
 LOCAL_CFLAGS += -DHDMI_DUAL_DISPLAY
 endif

diff --git a/liboverlay/Android.mk b/liboverlay/Android.mk
@@ -19,8 +19,6 @@ include $(CLEAR_VARS)
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
 LOCAL_SHARED_LIBRARIES := liblog libcutils libutils libmemalloc
-LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
 LOCAL_SRC_FILES := \
     overlayLib.cpp \
@@ -34,7 +32,7 @@ ifeq ($(TARGET_USES_POST_PROCESSING),true)
 LOCAL_CFLAGS += -DUSES_POST_PROCESSING
 LOCAL_SHARED_LIBRARIES += libmm-abl
 LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/pp/inc
-LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/lib/
+LOCAL_C_INCLUDES += vendor/qcom/proprietary/mm-core-noship/display/abl/inc
 endif
 LOCAL_MODULE := liboverlay
 LOCAL_MODULE_TAGS := optional

diff --git a/libqcomui/Android.mk b/libqcomui/Android.mk
@@ -4,6 +4,10 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
         qcom_ui.cpp
 
+ifeq ($(TARGET_BOARD_PLATFORM),msm7x27a)
+      LOCAL_CFLAGS += -DCHECK_FOR_EXTERNAL_FORMAT
+endif
+
 LOCAL_SHARED_LIBRARIES := \
         libutils \
         libcutils \
@@ -13,7 +17,7 @@ LOCAL_SHARED_LIBRARIES := \
 LOCAL_C_INCLUDES := $(TOP)/hardware/qcom/display/libgralloc \
 LOCAL_CFLAGS := -DLOG_TAG=\"libQcomUI\"
 
-ifneq ($(call is-vendor-board-platform,QCOM),true)
+ifneq ($(BOARD_USES_QCOM_HARDWARE),true)
     LOCAL_CFLAGS += -DNON_QCOM_TARGET
 else
     LOCAL_SHARED_LIBRARIES += libmemalloc

diff --git a/libtilerenderer/Android.mk b/libtilerenderer/Android.mk
@@ -20,6 +20,7 @@ LOCAL_C_INCLUDES += \
 LOCAL_SRC_FILES := 	\
 	tilerenderer.cpp
 
+LOCAL_CFLAGS += -DUSE_OPENGL_RENDERER -DQCOM_HARDWARE
 LOCAL_MODULE := libtilerenderer
 LOCAL_MODULE_TAGS := optional
 include $(BUILD_SHARED_LIBRARY)