display: Enable clang for all display modules
Change-Id: I71e3fa3f7d44253b8e01d1eafe086b1898d65a8e
diff --git a/libcopybit/Android.mk b/libcopybit/Android.mk
index f6f7ed5..a165826 100644
--- a/libcopybit/Android.mk
+++ b/libcopybit/Android.mk
@@ -26,8 +26,9 @@
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes)
LOCAL_SHARED_LIBRARIES := $(common_libs) libdl libmemalloc
-LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdcopybit\"
+LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdcopybit\" -Wno-sign-conversion
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
+LOCAL_CLANG := true
ifeq ($(TARGET_USES_C2D_COMPOSITION),true)
LOCAL_CFLAGS += -DCOPYBIT_Z180=1 -DC2D_SUPPORT_DISPLAY=1
diff --git a/libcopybit/copybit_c2d.cpp b/libcopybit/copybit_c2d.cpp
index 9936eb6..240ba26 100644
--- a/libcopybit/copybit_c2d.cpp
+++ b/libcopybit/copybit_c2d.cpp
@@ -194,22 +194,22 @@
struct hw_device_t** device);
static struct hw_module_methods_t copybit_module_methods = {
-open: open_copybit
+ .open = open_copybit,
};
/*
* The COPYBIT Module
*/
struct copybit_module_t HAL_MODULE_INFO_SYM = {
-common: {
-tag: HARDWARE_MODULE_TAG,
- version_major: 1,
- version_minor: 0,
- id: COPYBIT_HARDWARE_MODULE_ID,
- name: "QCT COPYBIT C2D 2.0 Module",
- author: "Qualcomm",
- methods: ©bit_module_methods
- }
+ .common = {
+ .tag = HARDWARE_MODULE_TAG,
+ .version_major = 1,
+ .version_minor = 0,
+ .id = COPYBIT_HARDWARE_MODULE_ID,
+ .name = "QCT COPYBIT C2D 2.0 Module",
+ .author = "Qualcomm",
+ .methods = ©bit_module_methods
+ }
};
@@ -925,27 +925,6 @@
return value;
}
-static int is_alpha(int cformat)
-{
- int alpha = 0;
- switch (cformat & 0xFF) {
- case C2D_COLOR_FORMAT_8888_ARGB:
- case C2D_COLOR_FORMAT_8888_RGBA:
- case C2D_COLOR_FORMAT_5551_RGBA:
- case C2D_COLOR_FORMAT_4444_ARGB:
- alpha = 1;
- break;
- default:
- alpha = 0;
- break;
- }
-
- if(alpha && (cformat&C2D_FORMAT_DISABLE_ALPHA))
- alpha = 0;
-
- return alpha;
-}
-
/* Function to check if we need a temporary buffer for the blit.
* This would happen if the requested destination stride and the
* C2D stride do not match. We ignore RGB buffers, since their