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

Commit aed1d581 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am 5a192121: Merge "Revert "Fix build after side-stepping global -Bsymbolic."" 

* commit '5a192121':
  Revert "Fix build after side-stepping global -Bsymbolic."
parents 4b599537 5a192121

media/libstagefright/codecs/amrwbenc/Android.mk

+0 −10
Original line number Diff line number Diff line
@@ -94,11 +94,6 @@ LOCAL_STATIC_LIBRARIES := 


LOCAL_SHARED_LIBRARIES :=



# We need this because the current asm generates the following link error:

# requires unsupported dynamic reloc R_ARM_REL32; recompile with -fPIC

# Bug: 16853291

LOCAL_LDFLAGS := -Wl,-Bsymbolic



LOCAL_C_INCLUDES := \

	frameworks/av/include \

	frameworks/av/media/libstagefright/include \
@@ -138,11 +133,6 @@ LOCAL_SHARED_LIBRARIES := \ 
        libstagefright_omx libstagefright_foundation libutils liblog \

        libstagefright_enc_common



# We need this because the current asm generates the following link error:

# requires unsupported dynamic reloc R_ARM_REL32; recompile with -fPIC

# Bug: 16853291

LOCAL_LDFLAGS := -Wl,-Bsymbolic



LOCAL_MODULE := libstagefright_soft_amrwbenc

LOCAL_MODULE_TAGS := optional

media/libstagefright/codecs/mp3dec/Android.mk

+0 −10
Original line number Diff line number Diff line
@@ -50,11 +50,6 @@ LOCAL_C_INCLUDES := \ 
LOCAL_CFLAGS := \

        -DOSCL_UNUSED_ARG=



# We need this because the current asm generates the following link error:

# requires unsupported dynamic reloc R_ARM_REL32; recompile with -fPIC

# Bug: 16853291

LOCAL_LDFLAGS := -Wl,-Bsymbolic



LOCAL_MODULE := libstagefright_mp3dec



LOCAL_ARM_MODE := arm
@@ -80,11 +75,6 @@ LOCAL_SHARED_LIBRARIES := \ 
LOCAL_STATIC_LIBRARIES := \

        libstagefright_mp3dec



# We need this because the current asm generates the following link error:

# requires unsupported dynamic reloc R_ARM_REL32; recompile with -fPIC

# Bug: 16853291

LOCAL_LDFLAGS := -Wl,-Bsymbolic



LOCAL_MODULE := libstagefright_soft_mp3dec

LOCAL_MODULE_TAGS := optional

media/libstagefright/codecs/on2/h264dec/Android.mk

+0 −5
Original line number Diff line number Diff line
@@ -100,11 +100,6 @@ endif 
LOCAL_SHARED_LIBRARIES := \

	libstagefright libstagefright_omx libstagefright_foundation libutils liblog \



# We need this because the current asm generates the following link error:

# requires unsupported dynamic reloc R_ARM_REL32; recompile with -fPIC

# Bug: 16853291

LOCAL_LDFLAGS := -Wl,-Bsymbolic



LOCAL_MODULE := libstagefright_soft_h264dec



LOCAL_MODULE_TAGS := optional