diff --git a/changeAppSettings.sh b/changeAppSettings.sh index 70493350e..f490caa86 100755 --- a/changeAppSettings.sh +++ b/changeAppSettings.sh @@ -881,6 +881,8 @@ else android update project -p $SDK_DIR/extras/google/google_play_services/libproject/google-play-services_lib fi +if [ -e project/jni/application/src/project.patch ]; then 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 for OUT in obj; do diff --git a/project/jni/application/hid-pc-keyboard/project.patch b/project/jni/application/hid-pc-keyboard/project.patch new file mode 100644 index 000000000..79e7a6f8a --- /dev/null +++ b/project/jni/application/hid-pc-keyboard/project.patch @@ -0,0 +1,11 @@ +--- a/project/AndroidManifest.xml 2014-11-24 19:30:31.003274516 +0200 ++++ b/project/AndroidManifest.xml 2014-11-24 19:30:33.547274398 +0200 +@@ -28,7 +28,7 @@ + + + +- ++ + + + diff --git a/project/jni/application/hid-pc-keyboard/src b/project/jni/application/hid-pc-keyboard/src index 830bb4a9c..2f7672c98 160000 --- a/project/jni/application/hid-pc-keyboard/src +++ b/project/jni/application/hid-pc-keyboard/src @@ -1 +1 @@ -Subproject commit 830bb4a9ca91514f646409cbf58149dada4be6be +Subproject commit 2f7672c98042b2a8c7e1fa72effe6c318aca7268 diff --git a/project/jni/application/teeworlds/src b/project/jni/application/teeworlds/src index f2adf45c2..18e0e9942 160000 --- a/project/jni/application/teeworlds/src +++ b/project/jni/application/teeworlds/src @@ -1 +1 @@ -Subproject commit f2adf45c2b1326f2f9a7447ffb92a2a6cf08c338 +Subproject commit 18e0e9942e73eb1e480d7d32c4eabbabcef8172e