diff options
| author | Dan Bornstein <danfuzz@android.com> | 2010-05-05 17:52:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-05 17:52:22 -0700 |
| commit | 71ec1d320e61c490bd3fac172f1d1a206a7198e8 (patch) | |
| tree | 0b1c68253ed5b3a862f77333bc756235f3aa50a7 /media | |
| parent | 13aec890216948b0c364f8f92792129d0335f506 (diff) | |
| parent | 77356c37030215a4b8696b7d0af44a724341a0f9 (diff) | |
| download | frameworks_av-71ec1d320e61c490bd3fac172f1d1a206a7198e8.zip frameworks_av-71ec1d320e61c490bd3fac172f1d1a206a7198e8.tar.gz frameworks_av-71ec1d320e61c490bd3fac172f1d1a206a7198e8.tar.bz2 | |
am 2a1674b1: am 2d315667: For issue #2651381, allow library prelinking.
Merge commit '2a1674b1d00fda68980ec834d6ce61aacd379bc8' into kraken
* commit '2a1674b1d00fda68980ec834d6ce61aacd379bc8':
For issue #2651381, allow library prelinking.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/codecs/amrnb/common/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/codecs/avc/common/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/colorconversion/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/omx/Android.mk | 2 |
5 files changed, 0 insertions, 10 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 8191cc7..0420a60 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -102,8 +102,6 @@ endif LOCAL_CFLAGS += -Wno-multichar -LOCAL_PRELINK_MODULE:= false - LOCAL_MODULE:= libstagefright include $(BUILD_SHARED_LIBRARY) diff --git a/media/libstagefright/codecs/amrnb/common/Android.mk b/media/libstagefright/codecs/amrnb/common/Android.mk index 2657a52..30ce29c 100644 --- a/media/libstagefright/codecs/amrnb/common/Android.mk +++ b/media/libstagefright/codecs/amrnb/common/Android.mk @@ -69,8 +69,6 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := \ -DOSCL_UNUSED_ARG= -DOSCL_IMPORT_REF= -DOSCL_EXPORT_REF= -LOCAL_PRELINK_MODULE:= false - LOCAL_MODULE := libstagefright_amrnb_common include $(BUILD_SHARED_LIBRARY) diff --git a/media/libstagefright/codecs/avc/common/Android.mk b/media/libstagefright/codecs/avc/common/Android.mk index 39c6da8..22dee15 100644 --- a/media/libstagefright/codecs/avc/common/Android.mk +++ b/media/libstagefright/codecs/avc/common/Android.mk @@ -16,6 +16,4 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include -LOCAL_PRELINK_MODULE:= false - include $(BUILD_SHARED_LIBRARY) diff --git a/media/libstagefright/colorconversion/Android.mk b/media/libstagefright/colorconversion/Android.mk index e7a571a..b9ba1be 100644 --- a/media/libstagefright/colorconversion/Android.mk +++ b/media/libstagefright/colorconversion/Android.mk @@ -17,8 +17,6 @@ LOCAL_SHARED_LIBRARIES := \ libsurfaceflinger_client\ libcamera_client -LOCAL_PRELINK_MODULE:= false - LOCAL_MODULE:= libstagefright_color_conversion include $(BUILD_SHARED_LIBRARY) diff --git a/media/libstagefright/omx/Android.mk b/media/libstagefright/omx/Android.mk index 2473731..f4f5cc1 100644 --- a/media/libstagefright/omx/Android.mk +++ b/media/libstagefright/omx/Android.mk @@ -42,8 +42,6 @@ ifneq ($(TARGET_SIMULATOR),true) LOCAL_SHARED_LIBRARIES += libdl endif -LOCAL_PRELINK_MODULE:= false - LOCAL_MODULE:= libstagefright_omx include $(BUILD_SHARED_LIBRARY) |