commit 0a03dd8b11d08375b9f8eb19110f763112ce58ef
author Kinjal Bhavsar <kbhavsar@codeaurora.org> Tue Sep 18 18:46:51 2012 -0700
committer Iliyan Malchev <malchev@google.com> Tue Sep 18 19:32:35 2012 -0700
tree 76fa29f737e41c796e96213ba4036b8b78561f0e
parent 35712cb6398dc0f7442fe8951ce1e6eec4647f5c

genlock: conditionally enable genlock from Android.mk for msm8960

Change-Id: I671e227a3b442bc22c53335614832e37324d7cac

libgenlock/Android.mk

diff --git a/libgenlock/Android.mk b/libgenlock/Android.mk
index 92ac227..72dc6c5 100644
--- a/libgenlock/Android.mk
+++ b/libgenlock/Android.mk
@@ -7,6 +7,9 @@
 LOCAL_C_INCLUDES              := $(common_includes)
 LOCAL_SHARED_LIBRARIES        := liblog libcutils
 LOCAL_CFLAGS                  := $(common_flags) -DLOG_TAG=\"libgenlock\"
+ifneq ($(TARGET_BOARD_PLATFORM), msm8960)
+	LOCAL_CFLAGS += -DUSE_GENLOCK
+endif
 LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
 LOCAL_SRC_FILES               := genlock.cpp
 include $(BUILD_SHARED_LIBRARY)

libgenlock/genlock.cpp

diff --git a/libgenlock/genlock.cpp b/libgenlock/genlock.cpp
index 150ae13..344cbaa 100644
--- a/libgenlock/genlock.cpp
+++ b/libgenlock/genlock.cpp
@@ -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)