Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4463cbc6 authored May 08, 2014 by Ying Wang Committed by Android Git Automerger May 08, 2014

am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."

* commit '3b9600b6':
  Remove unused LOCAL_LDLIBS.

parents 691079dd 3b9600b6

core/jni/Android.mk

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -224,8 +224,6 @@ LOCAL_SHARED_LIBRARIES += \
	# <bionic_tls.h> in com_google_android_gles_jni_GLImpl.cpp		# <bionic_tls.h> in com_google_android_gles_jni_GLImpl.cpp
	LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private		LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private

	LOCAL_LDLIBS += -lpthread -ldl

	ifeq ($(WITH_MALLOC_LEAK_CHECK),true)		ifeq ($(WITH_MALLOC_LEAK_CHECK),true)
	LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK		LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK
	endif		endif

media/jni/Android.mk

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -65,8 +65,6 @@ LOCAL_C_INCLUDES += \

	LOCAL_CFLAGS +=		LOCAL_CFLAGS +=

	LOCAL_LDLIBS := -lpthread

	LOCAL_MODULE:= libmedia_jni		LOCAL_MODULE:= libmedia_jni

	include $(BUILD_SHARED_LIBRARY)		include $(BUILD_SHARED_LIBRARY)

rs/jni/Android.mk

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,6 @@ LOCAL_C_INCLUDES += \

	LOCAL_CFLAGS += -Wno-unused-parameter		LOCAL_CFLAGS += -Wno-unused-parameter

	LOCAL_LDLIBS := -lpthread
	LOCAL_ADDITIONAL_DEPENDENCIES := $(addprefix $(rs_generated_include_dir)/,rsgApiFuncDecl.h)		LOCAL_ADDITIONAL_DEPENDENCIES := $(addprefix $(rs_generated_include_dir)/,rsgApiFuncDecl.h)
	LOCAL_MODULE:= librs_jni		LOCAL_MODULE:= librs_jni
	LOCAL_ADDITIONAL_DEPENDENCIES += $(rs_generated_source)		LOCAL_ADDITIONAL_DEPENDENCIES += $(rs_generated_source)