From 22a0392cf3455c4d21d805cbbac82a8f28bbd8d3 Mon Sep 17 00:00:00 2001 From: Andrew Sutherland Date: Tue, 22 May 2012 17:04:57 -0500 Subject: [PATCH] libgenlock: always define USE_GENLOCK Change-Id: I865499212dc96fb19a536040c06767ccda93e21c --- libgenlock/Android.mk | 6 +----- libgenlock/genlock.cpp | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libgenlock/Android.mk b/libgenlock/Android.mk index 09b8a64..649f3f3 100644 --- a/libgenlock/Android.mk +++ b/libgenlock/Android.mk @@ -4,15 +4,11 @@ include $(CLEAR_VARS) LOCAL_PRELINK_MODULE := false LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES) LOCAL_SHARED_LIBRARIES := liblog libcutils -LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc +LOCAL_C_INCLUDES := hardware/qcom/display/libgralloc LOCAL_SRC_FILES := genlock.cpp LOCAL_CFLAGS:= -DLOG_TAG=\"libgenlock\" LOCAL_MODULE_TAGS := optional -ifeq ($(TARGET_USES_GENLOCK),true) - LOCAL_CFLAGS += -DUSE_GENLOCK -endif - LOCAL_MODULE := libgenlock include $(BUILD_SHARED_LIBRARY) diff --git a/libgenlock/genlock.cpp b/libgenlock/genlock.cpp index 1309af6..429b467 100644 --- a/libgenlock/genlock.cpp +++ b/libgenlock/genlock.cpp @@ -38,6 +38,10 @@ #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)