Fix ffmpeg build script's strip tool for armeabi-v7a

Broken in bf21e3c690. PiperOrigin-RevId: 344777455
2020-11-30 10:59:37 +00:00 · 2020-11-30 10:59:37 +00:00 · 054bff80fd
commit 054bff80fd
parent 9f6ff55c0f
2 changed files with 1 additions and 2 deletions
--- a/extensions/av1/src/main/proguard-rules.pgcfg
+++ b/extensions/av1/src/main/proguard-rules.pgcfg
@ -1 +0,0 @@
-../../proguard-rules.txt
--- 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}