From 9567d245ceb91520b4a10fa8940ab48d19007c29 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Wed, 16 Sep 2015 19:28:12 +0300 Subject: [PATCH] SDL: fix to applying project.patch if it was already applied before --- changeAppSettings.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changeAppSettings.sh b/changeAppSettings.sh index 87fdfee2c..392455b11 100755 --- a/changeAppSettings.sh +++ b/changeAppSettings.sh @@ -933,7 +933,7 @@ fi ln -s -f $SDK_DIR/platforms/android-23/optional/org.apache.http.legacy.jar project/libs -if [ -e project/jni/application/src/project.patch ]; then patch -p1 --no-backup-if-mismatch < project/jni/application/src/project.patch || exit 1 ; fi +if [ -e project/jni/application/src/project.patch ]; then patch -p1 --dry-run -f -R < project/jni/application/src/project.patch > /dev/null 2>&1 || patch -p1 --no-backup-if-mismatch < project/jni/application/src/project.patch || exit 1 ; fi echo Cleaning up dependencies rm -rf project/libs/*/* project/gen