From 0de6577a2be9cb40a71b13fd05abf37ff9cfc17e Mon Sep 17 00:00:00 2001 From: thermatk Date: Sun, 25 Oct 2020 15:16:26 +0000 Subject: [PATCH] Add gitignore submodules --- .gitignore | 4 ---- .gitmodules | 2 ++ bin/update_libs.sh | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ca1dd442f..2df41b882 100644 --- a/.gitignore +++ b/.gitignore @@ -6,10 +6,6 @@ obj/ local.properties .externalNativeBuild .cxx -/TMessagesProj/jni/ffmpeg/build/ -/TMessagesProj/jni/boringssl/build/ -CMakeLists.txt -CMakeLists.txt.orig service_account_credentials.json *.aar *.so \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index b12a9c3ff..f14f4e971 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,11 @@ [submodule "TMessagesProj/jni/ffmpeg"] path = TMessagesProj/jni/ffmpeg url = https://github.com/FFmpeg/FFmpeg + ignore = dirty [submodule "TMessagesProj/jni/boringssl"] path = TMessagesProj/jni/boringssl url = https://github.com/google/boringssl + ignore = dirty [submodule "ss-rust/src/main/rust/shadowsocks-rust"] path = ss-rust/src/main/rust/shadowsocks-rust diff --git a/bin/update_libs.sh b/bin/update_libs.sh index f5e48e7ab..441025a5d 100755 --- a/bin/update_libs.sh +++ b/bin/update_libs.sh @@ -6,7 +6,7 @@ if [ ! -x "$(command -v go)" ]; then # if [ ! -x "$(command -v gvm)" ]; then # - # apt install -y bison + # apt install -y bison gcc make # bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer) # source "$HOME/.bashrc" #