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

Commit 2dfe8ea7 authored by Dan Albert's avatar Dan Albert Committed by Android (Google) Code Review
Browse files

Merge changes Idc9808f7,If7bc8e5b into lmp-dev 

* changes:
  Fix the build after -Bsymbolic fix.
  Fix PIC relocations for non-Bsymbolic builds
parents e079c76c e43f501f

media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
          .global  Filt_6k_7k_asm

          .extern  voAWB_Copy

          .extern  fir_6k_7k

          .hidden  fir_6k_7k



Filt_6k_7k_asm:

media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
         .section  .text

	 .global   pred_lt4_asm

	 .extern   inter4_2

	 .hidden   inter4_2



pred_lt4_asm:

media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
          .section  .text

          .global   Filt_6k_7k_asm

          .extern   fir_6k_7k

          .hidden   fir_6k_7k



Filt_6k_7k_asm:

media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
          .section  .text

          .global   pred_lt4_asm

          .extern   inter4_2

          .hidden   inter4_2



pred_lt4_asm:

media/libstagefright/codecs/hevcdec/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ LOCAL_SHARED_LIBRARIES += libstagefright_foundation 
LOCAL_SHARED_LIBRARIES  += libutils

LOCAL_SHARED_LIBRARIES  += 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



include $(BUILD_SHARED_LIBRARY)