For issue #2651381, allow library prelinking.

Change-Id: I119348b55ad0015a286e9c94709977cd1973a7e1

diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 8191cc7..0420a60 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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)