diff options
| author | Ying Wang <wangying@google.com> | 2014-05-08 00:27:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 00:27:09 +0000 |
| commit | db55bb0622e9fbe4b858d59409f516de01c1f1fd (patch) | |
| tree | e5b9b9a51a3b9e06b02bae72641f06d76760f4eb | |
| parent | 101e379318a3869f64ea897a3f95a89243408c94 (diff) | |
| parent | 4463cbc61d0947eccb67a52f60661a92d0cad508 (diff) | |
| download | frameworks_base-db55bb0622e9fbe4b858d59409f516de01c1f1fd.zip frameworks_base-db55bb0622e9fbe4b858d59409f516de01c1f1fd.tar.gz frameworks_base-db55bb0622e9fbe4b858d59409f516de01c1f1fd.tar.bz2 | |
am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."
* commit '4463cbc61d0947eccb67a52f60661a92d0cad508':
Remove unused LOCAL_LDLIBS.
| -rw-r--r-- | core/jni/Android.mk | 2 | ||||
| -rw-r--r-- | media/jni/Android.mk | 2 | ||||
| -rw-r--r-- | rs/jni/Android.mk | 1 |
3 files changed, 0 insertions, 5 deletions
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 @@ 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 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_C_INCLUDES += \ LOCAL_CFLAGS += -LOCAL_LDLIBS := -lpthread - LOCAL_MODULE:= libmedia_jni include $(BUILD_SHARED_LIBRARY) 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_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) |