commit 4a99e243b42afcb885d036bb451eb3c2739275b6
author Ying Wang <wangying@google.com> Wed May 07 22:45:47 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 07 22:45:47 2014 +0000
tree ec2c28281bb87c8bffca4810fbc1ad0101d57b41
parent 1691b57dbad9cfc15b9a8b72f8b376733b934ffe
parent d6325e0258d2986d106a443b43b60e1aa660f01f

Merge "Remove unused LOCAL_LDLIBS."

Android.mk

diff --git a/Android.mk b/Android.mk
index a78e602..6c71d0c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,7 +8,6 @@
 LOCAL_C_INCLUDES := \
         $(LOCAL_PATH)/cxcore/include
 LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%)
-LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -ldl
 
 LOCAL_SRC_FILES := \
         cxcore/src/cxalloc.cpp \
@@ -56,7 +55,6 @@
         $(LOCAL_PATH)/cxcore/src \
         $(LOCAL_PATH)/cv/include
 LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%)
-LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -ldl
 
 LOCAL_SRC_FILES := \
         cv/src/cvaccum.cpp \
@@ -138,7 +136,6 @@
         $(LOCAL_PATH)/cxcore/include \
         $(LOCAL_PATH)/cvaux/include
 LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%)
-LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -ldl
 
 LOCAL_SRC_FILES := \
         cvaux/src/camshift.cpp \
@@ -202,7 +199,6 @@
         $(LOCAL_PATH)/cxcore/include \
         $(LOCAL_PATH)/ml/include
 LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%)
-LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -ldl
 
 LOCAL_SRC_FILES := \
         ml/src/ml.cpp \
@@ -237,7 +233,6 @@
 LOCAL_SHARED_LIBRARIES += libjpeg
 
 LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) -DHAVE_JPEG
-LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -ldl -ljpeg
 
 LOCAL_SRC_FILES := \
         otherlibs/highgui/bitstrm.cpp \
@@ -268,8 +263,6 @@
 include $(LOCAL_PATH)/libopencv.mk
 
 LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%)
-LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -ldl -llog \
-                -L$(TARGET_OUT) -lcxcore -lcv -lcvaux -lcvml -lcvhighgui
 
 
 LOCAL_SRC_FILES := \
@@ -279,4 +272,3 @@
 LOCAL_STATIC_LIBRARIES := libcxcore libcv libcvaux libcvml libcvhighgui
 
 include $(BUILD_STATIC_LIBRARY)
-