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

Commit ec8b67eb authored by Dan Albert's avatar Dan Albert
Browse files

Resolved conflicts for merge of 2af8711d to lmp-dev-plus-aosp 

Change-Id: I016dbca0318998f17fc741f873589c414774e7ff
parents 9fdc1f14 2af8711d

media/libstagefright/codecs/amrwbenc/Android.mk

+10 −0
Original line number Diff line number Diff line
@@ -94,6 +94,11 @@ 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 \
@@ -137,6 +142,11 @@ 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

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


LOCAL_CFLAGS += -Werror



# 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
@@ -79,6 +84,11 @@ 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

+5 −0
Original line number Diff line number Diff line
@@ -100,6 +100,11 @@ 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