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

Commit 29894c61 authored May 08, 2014 by Ying Wang Committed by Android Git Automerger May 08, 2014

am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."

* commit 'db55bb06':
  Remove unused LOCAL_LDLIBS.

parents a3ef079a db55bb06

core/jni/Android.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -241,8 +241,6 @@ LOCAL_SHARED_LIBRARIES += \
		# <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

+0 −2

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

		LOCAL_CFLAGS +=

		LOCAL_LDLIBS := -lpthread

		LOCAL_MODULE:= libmedia_jni

		include $(BUILD_SHARED_LIBRARY)

rs/jni/Android.mk

+0 −1

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

		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)