diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-07-12 23:18:52 +0159 |
|---|---|---|
| committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-06-10 19:06:23 +0200 |
| commit | 7950b3093672bf5d92db9619e9ce6a3571a81c5e (patch) | |
| tree | 1a72b12f049f7800b4cb9dc8a6bac5b512b246d0 | |
| parent | b63f3052d7f36fc22aede5048e7f1dc7975f00d3 (diff) | |
| download | ffmpeg-7950b3093672bf5d92db9619e9ce6a3571a81c5e.tar.gz | |
ffmpeg: Don't use armelf.x on JellyBean
Change-Id: I8bccafac484984bcadfaa05f2c606523c77b0761
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index bfc9100e34..d11bd7518b 100644 --- a/Android.mk +++ b/Android.mk @@ -33,7 +33,7 @@ ffmpeg: x264 $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libvpx_intermediates/libvpx.a --enable-libx264 \ --enable-cross-compile \ --cross-prefix=$(FFMPEG_TCPREFIX) \ - --extra-ldflags="-nostdlib -Wl,-dynamic-linker,/system/bin/linker,-z,muldefs,-T$(REALTOP)/$(BUILD_SYSTEM)/armelf.x,-z,nocopyreloc,--no-undefined -L$(REALTOP)/$(TARGET_OUT_STATIC_LIBRARIES) -L$(REALTOP)/$(PRODUCT_OUT)/system/lib -L$(REALTOP)/$(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libvpx_intermediates -ldl -lc" \ + --extra-ldflags="-nostdlib -Wl,-dynamic-linker,/system/bin/linker,-z,muldefs$(shell if test $(PRODUCT_SDK_VERSION) -lt 16; then echo -n ',-T$(REALTOP)/$(BUILD_SYSTEM)/armelf.x'; fi),-z,nocopyreloc,--no-undefined -L$(REALTOP)/$(TARGET_OUT_STATIC_LIBRARIES) -L$(REALTOP)/$(PRODUCT_OUT)/system/lib -L$(REALTOP)/$(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libvpx_intermediates -ldl -lc" \ --extra-cflags="$(FFMPEG_COMPILER_FLAGS) -I$(REALTOP)/bionic/libc/include -I$(REALTOP)/bionic/libc/kernel/common -I$(REALTOP)/bionic/libc/kernel/arch-arm -I$(REALTOP)/bionic/libc/arch-arm/include -I$(REALTOP)/bionic/libm/include -I$(REALTOP)/external/libvpx -I$(REALTOP)/external/x264" \ --extra-libs="-lgcc" && \ $(MAKE) TARGET_CRTBEGIN_DYNAMIC_O=$(REALTOP)/$(TARGET_CRTBEGIN_DYNAMIC_O) TARGET_CRTEND_O=$(REALTOP)/$(TARGET_CRTEND_O) $(FF_VERBOSE) && \ |