diff --git a/.gitmodules b/.gitmodules index a697dce08..298c6d002 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,3 +21,4 @@ [submodule "extern/jmdns"] path = extern/jmdns url = https://gitlab.com/fdroid/jmdns.git + ignore = dirty diff --git a/ant-prepare.sh b/ant-prepare.sh index 637e5f7e1..04a4ae685 100755 --- a/ant-prepare.sh +++ b/ant-prepare.sh @@ -3,8 +3,7 @@ android update lib-project --path extern/UniversalImageLoader/library android update lib-project --path extern/AndroidPinning android update lib-project --path extern/MemorizingTrustManager -android update lib-project --path extern/nanohttpd -#android update lib-project --path extern/nanohttpd/core +android update lib-project --path extern/nanohttpd/core android update lib-project --path extern/libsuperuser/libsuperuser android update lib-project --path extern/jmdns android update project --path . --name F-Droid diff --git a/extern/nanohttpd b/extern/nanohttpd index 73cb37f86..2f0130856 160000 --- a/extern/nanohttpd +++ b/extern/nanohttpd @@ -1 +1 @@ -Subproject commit 73cb37f863c41b8f021019703d6453887b656dd6 +Subproject commit 2f0130856add775db8d512199d4015a4f4d10cf4 diff --git a/project.properties b/project.properties index 94514466a..734459ba3 100644 --- a/project.properties +++ b/project.properties @@ -5,7 +5,6 @@ target=android-19 android.library.reference.1=extern/UniversalImageLoader/library android.library.reference.2=extern/MemorizingTrustManager android.library.reference.3=extern/AndroidPinning -android.library.reference.4=extern/nanohttpd -#android.library.reference.4=extern/nanohttpd/core +android.library.reference.4=extern/nanohttpd/core android.library.reference.5=extern/libsuperuser/libsuperuser android.library.reference.6=extern/jmdns