am 2d315667: For issue #2651381, allow library prelinking.

Merge commit '2d315667ab733375d8c696f8c2f155bc1de9e4a2' into froyo-plus-aosp * commit '2d315667ab733375d8c696f8c2f155bc1de9e4a2': For issue #2651381, allow library prelinking.
2010-05-05 17:50:28 -07:00
parent f78964490d 2d315667ab
commit 2a1674b1d0
5 changed files with 0 additions and 10 deletions
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)