diff options
| author | Ying Wang <wangying@google.com> | 2014-05-07 22:45:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-07 22:45:47 +0000 |
| commit | 4a99e243b42afcb885d036bb451eb3c2739275b6 (patch) | |
| tree | ec2c28281bb87c8bffca4810fbc1ad0101d57b41 | |
| parent | 1691b57dbad9cfc15b9a8b72f8b376733b934ffe (diff) | |
| parent | d6325e0258d2986d106a443b43b60e1aa660f01f (diff) | |
| download | opencv-4a99e243b42afcb885d036bb451eb3c2739275b6.tar.gz | |
Merge "Remove unused LOCAL_LDLIBS."android-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-preview
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -8,7 +8,6 @@ LOCAL_MODULE_TAGS := optional 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_C_INCLUDES := \ $(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_C_INCLUDES := \ $(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_C_INCLUDES := \ $(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_C_INCLUDES := \ 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 @@ LOCAL_MODULE_TAGS := optional 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_SRC_FILES := \ LOCAL_STATIC_LIBRARIES := libcxcore libcv libcvaux libcvml libcvhighgui include $(BUILD_STATIC_LIBRARY) - |