From b0d4ae5c3a9241dcbfd0c39021ba00500c74ca4d Mon Sep 17 00:00:00 2001
From: Naseer Ahmed <naseer@codeaurora.org>
Date: Sat, 19 Nov 2011 21:33:18 -0800
Subject: [PATCH] libcopybit: Enable copybit in new location

- Enabled copybit HAL
- Remove copybit support for 8k targets from Makefile.

Change-Id: I15ea4851c677bc9338159a8db667056655dddc13
---
 Android.mk            |  2 +-
 libcopybit/Android.mk | 25 ++++---------------------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/Android.mk b/Android.mk
index bb38442..1f6937f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,4 @@
 #Enables the listed display HAL modules
-display-hals := libhwcomposer liboverlay libgralloc
+display-hals := libhwcomposer liboverlay libgralloc libcopybit
 include $(call all-named-subdir-makefiles,$(display-hals))
 
diff --git a/libcopybit/Android.mk b/libcopybit/Android.mk
index e2c083f..5740a65 100644
--- a/libcopybit/Android.mk
+++ b/libcopybit/Android.mk
@@ -28,14 +28,15 @@ ifeq ($(TARGET_USES_C2D_COMPOSITION),true)
     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 "$(findstring msm7630,$(TARGET_PRODUCT))" "msm7630"
-        ifeq ($(TARGET_BOARD_PLATFORM),msm7k)
+    ifneq ($(call is-chipset-in-board-platform,msm7630),true)
+        ifeq ($(call is-board-platform-in-list,$(MSM7K_BOARD_PLATFORMS)),true)
             include $(CLEAR_VARS)
             ifeq ($(TARGET_GRALLOC_USES_ASHMEM),true)
                 LOCAL_CFLAGS += -DUSE_ASHMEM
-                ifeq "$(findstring msm7627,$(TARGET_PRODUCT))" "msm7627"
+                ifeq ($(call is-chipset-prefix-in-board-platform,msm7627),true)
                    LOCAL_CFLAGS += -DTARGET_7x27
                 endif
             endif
@@ -51,23 +52,5 @@ else
             LOCAL_CFLAGS += -DCOPYBIT_MSM7K=1
             include $(BUILD_SHARED_LIBRARY)
         endif
-
-        ifeq ($(TARGET_BOARD_PLATFORM),qsd8k)
-            include $(CLEAR_VARS)
-            ifeq ($(TARGET_GRALLOC_USES_ASHMEM),true)
-                LOCAL_CFLAGS += -DUSE_ASHMEM
-            endif
-
-            LOCAL_PRELINK_MODULE := false
-            LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
-            LOCAL_SHARED_LIBRARIES := liblog
-            LOCAL_SRC_FILES := copybit.cpp
-            LOCAL_MODULE := copybit.qsd8k
-            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_QSD8K=1
-            include $(BUILD_SHARED_LIBRARY)
-        endif
     endif
 endif