commit 4463cbc61d0947eccb67a52f60661a92d0cad508
author Ying Wang <wangying@google.com> Thu May 08 00:21:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 08 00:21:38 2014 +0000
tree 9b7328c980f881efbdae646f2ac6df596c15e129
parent 691079ddc0055fac9b82dccaf35b4591978b2a55
parent 3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3

am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."

* commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3':
  Remove unused LOCAL_LDLIBS.

core/jni/Android.mk

diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index fda4114..bdef428 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -224,8 +224,6 @@
 # <bionic_tls.h> in com_google_android_gles_jni_GLImpl.cpp
 LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private
 
-LOCAL_LDLIBS += -lpthread -ldl
-
 ifeq ($(WITH_MALLOC_LEAK_CHECK),true)
 	LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK
 endif

media/jni/Android.mk

diff --git a/media/jni/Android.mk b/media/jni/Android.mk
index dea971e..eb4d0d9 100644
--- a/media/jni/Android.mk
+++ b/media/jni/Android.mk
@@ -65,8 +65,6 @@
 
 LOCAL_CFLAGS +=
 
-LOCAL_LDLIBS := -lpthread
-
 LOCAL_MODULE:= libmedia_jni
 
 include $(BUILD_SHARED_LIBRARY)

rs/jni/Android.mk

diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk
index cbb5b3b..e69432d 100644
--- a/rs/jni/Android.mk
+++ b/rs/jni/Android.mk
@@ -28,7 +28,6 @@
 
 LOCAL_CFLAGS += -Wno-unused-parameter
 
-LOCAL_LDLIBS := -lpthread
 LOCAL_ADDITIONAL_DEPENDENCIES := $(addprefix $(rs_generated_include_dir)/,rsgApiFuncDecl.h)
 LOCAL_MODULE:= librs_jni
 LOCAL_ADDITIONAL_DEPENDENCIES += $(rs_generated_source)