diff --git a/.gitmodules b/.gitmodules index b7fc6cc3aa..0557b62dd1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ [submodule "TMessagesProj/jni/boringssl"] path = TMessagesProj/jni/boringssl url = https://github.com/google/boringssl - ignore = dirty + ignore = all [submodule "TMessagesProj/jni/libvpx"] path = TMessagesProj/jni/libvpx url = https://github.com/webmproject/libvpx diff --git a/TMessagesProj/jni/build_libvpx_clang.sh b/TMessagesProj/jni/build_libvpx_clang.sh index 7429f15c5b..7ddd7a028e 100755 --- a/TMessagesProj/jni/build_libvpx_clang.sh +++ b/TMessagesProj/jni/build_libvpx_clang.sh @@ -145,7 +145,7 @@ function build { CPU=i686 OPTIMIZE_CFLAGS="-O3 -march=i686 -mtune=intel -msse3 -mfpmath=sse -m32 -fPIC" TARGET="x86-android-gcc" - PREFIX=./build/x86 + PREFIX=./build/$ARCH CPU_DETECT="--enable-runtime-cpu-detect" build_one ;; @@ -184,7 +184,7 @@ function build { } if (( $# == 0 )); then - build x86 x86_64 arm arm64 + build x86_64 x86 arm arm64 else build $@ fi diff --git a/TMessagesProj/jni/libvpx b/TMessagesProj/jni/libvpx index 626ff35955..10b9492dcf 160000 --- a/TMessagesProj/jni/libvpx +++ b/TMessagesProj/jni/libvpx @@ -1 +1 @@ -Subproject commit 626ff35955c2c35b806b3e0ecf551a1a8611cdbf +Subproject commit 10b9492dcf05b652e2e4b370e205bd605d421972