fix compile error by 'android/ndk#630'

wysaid · Dec 1, 2021 · ed08d7c · ed08d7c
1 parent b6ba243
commit ed08d7c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/build_script/ffmpeg/build_android_arm64_v8a.sh b/build_script/ffmpeg/build_android_arm64_v8a.sh
@@ -94,7 +94,8 @@ echo ./configure \
     ${MODULES} \
     --disable-doc \
     --enable-neon \
-    --disable-filters
+    --disable-filters \
+    --disable-linux-perf
 
 ./configure \
     --target-os=linux \
@@ -161,7 +162,8 @@ echo ./configure \
     --enable-neon \
     --disable-filters \
     --enable-pic \
-    --enable-yasm
+    --enable-yasm \
+    --disable-linux-perf
 
 make clean
 make -j$(getconf _NPROCESSORS_ONLN)

diff --git a/build_script/ffmpeg/build_android_armeabi_v7a.sh b/build_script/ffmpeg/build_android_armeabi_v7a.sh
@@ -94,7 +94,8 @@ echo ./configure \
     ${MODULES} \
     --disable-doc \
     --enable-neon \
-    --disable-filters
+    --disable-filters \
+    --disable-linux-perf
 
 ./configure \
     --target-os=linux \
@@ -161,7 +162,8 @@ echo ./configure \
     --enable-neon \
     --disable-filters \
     --enable-pic \
-    --enable-yasm
+    --enable-yasm \
+    --disable-linux-perf
 
 make clean
 make -j$(getconf _NPROCESSORS_ONLN)

diff --git a/build_script/ffmpeg/build_android_x86.sh b/build_script/ffmpeg/build_android_x86.sh
@@ -96,7 +96,8 @@ echo ./configure \
     --enable-neon \
     --disable-filters \
     --enable-pic \
-    --enable-yasm
+    --enable-yasm \
+    --disable-linux-perf
 
 ./configure \
     --target-os=linux \
@@ -163,7 +164,8 @@ echo ./configure \
     --enable-neon \
     --disable-filters \
     --enable-pic \
-    --enable-yasm
+    --enable-yasm \
+    --disable-linux-perf
 
 make clean
 make -j$(getconf _NPROCESSORS_ONLN)

diff --git a/build_script/ffmpeg/build_android_x86_64.sh b/build_script/ffmpeg/build_android_x86_64.sh
@@ -96,7 +96,8 @@ echo ./configure \
     --enable-neon \
     --disable-filters \
     --enable-pic \
-    --enable-yasm
+    --enable-yasm \
+    --disable-linux-perf
 
 ./configure \
     --target-os=linux \
@@ -163,7 +164,8 @@ echo ./configure \
     --enable-neon \
     --disable-filters \
     --enable-pic \
-    --enable-yasm
+    --enable-yasm \
+    --disable-linux-perf
 
 make clean
 make -j$(getconf _NPROCESSORS_ONLN)