From 054bff80fd6ff999748f9ff059f070192f91a2eb Mon Sep 17 00:00:00 2001 From: aquilescanta Date: Mon, 30 Nov 2020 10:59:37 +0000 Subject: [PATCH] Fix ffmpeg build script's strip tool for armeabi-v7a Broken in https://github.com/google/ExoPlayer/commit/bf21e3c690cfbab6cdbb76b3dd6e353f7221b3f1. PiperOrigin-RevId: 344777455 --- extensions/av1/src/main/proguard-rules.pgcfg | 1 - extensions/ffmpeg/src/main/jni/build_ffmpeg.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 120000 extensions/av1/src/main/proguard-rules.pgcfg diff --git a/extensions/av1/src/main/proguard-rules.pgcfg b/extensions/av1/src/main/proguard-rules.pgcfg deleted file mode 120000 index 499fb08b36..0000000000 --- a/extensions/av1/src/main/proguard-rules.pgcfg +++ /dev/null @@ -1 +0,0 @@ -../../proguard-rules.txt \ No newline at end of file diff --git a/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh b/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh index ab3c85d376..7b2e933902 100755 --- a/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh +++ b/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh @@ -52,7 +52,7 @@ cd "${FFMPEG_EXT_PATH}/jni/ffmpeg" --nm="${TOOLCHAIN_PREFIX}/arm-linux-androideabi-nm" \ --ar="${TOOLCHAIN_PREFIX}/arm-linux-androideabi-ar" \ --ranlib="${TOOLCHAIN_PREFIX}/arm-linux-androideabi-ranlib" \ - --strip="${TOOLCHAIN_PREFIX}/armv7a-linux-androideabi-strip" \ + --strip="${TOOLCHAIN_PREFIX}/arm-linux-androideabi-strip" \ --extra-cflags="-march=armv7-a -mfloat-abi=softfp" \ --extra-ldflags="-Wl,--fix-cortex-a8" \ ${COMMON_OPTIONS}