android/android_hardware_qcom_display
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libgenlock: clean up kernel includes and make USE_GENLOCK a BoardConfig option.

Browse Source 
this fixes issues with devices not yet supporting the genlock API in in kernel space.

Change-Id: I734d8db95f7030c1492122283d76e81ca5fb8aa2
This commit is contained in:
toastcfh 2011-12-18 19:51:58 -05:00
parent b67994677f
commit c8f578b1c9
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libgenlock/Android.mk
View File

@ -4,12 +4,15 @@ 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_SRC_FILES := genlock.cpp
LOCAL_CFLAGS:= -DLOG_TAG=\"libgenlock\"
LOCAL_MODULE_TAGS := optional
ifeq ($(BOARD_USES_GENLOCK),true)
LOCAL_CFLAGS += -DUSE_GENLOCK
endif
LOCAL_MODULE := libgenlock
include $(BUILD_SHARED_LIBRARY)

4
libgenlock/genlock.cpp
View File

@ -38,10 +38,6 @@
#define GENLOCK_DEVICE "/dev/genlock"
#ifndef USE_GENLOCK
#define USE_GENLOCK
#endif
namespace {
/* Internal function to map the userspace locks to the kernel lock types */
int get_kernel_lock_type(genlock_lock_type lockType)