From 52c61ec1caae164b7ff93e6751ba220e8d59d647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 7 May 2014 22:02:40 +0200
Subject: [PATCH] Update nanohttpd, replace as an ant library

---
 .gitmodules                                | 1 +
 ant-prepare.sh                             | 1 +
 extern/nanohttpd                           | 2 +-
 project.properties                         | 1 +
 src/fi/iki/elonen/InternalRewrite.java     | 1 -
 src/fi/iki/elonen/NanoHTTPD.java           | 1 -
 src/fi/iki/elonen/ServerRunner.java        | 1 -
 src/fi/iki/elonen/WebServerPlugin.java     | 1 -
 src/fi/iki/elonen/WebServerPluginInfo.java | 1 -
 9 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 120000 src/fi/iki/elonen/InternalRewrite.java
 delete mode 120000 src/fi/iki/elonen/NanoHTTPD.java
 delete mode 120000 src/fi/iki/elonen/ServerRunner.java
 delete mode 120000 src/fi/iki/elonen/WebServerPlugin.java
 delete mode 120000 src/fi/iki/elonen/WebServerPluginInfo.java

diff --git a/.gitmodules b/.gitmodules
index f4e70c3aa..46dfaab88 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,4 @@
 [submodule "extern/nanohttpd"]
 	path = extern/nanohttpd
 	url = https://github.com/eighthave/nanohttpd
+	ignore = dirty
diff --git a/ant-prepare.sh b/ant-prepare.sh
index a7173b000..bc0938469 100755
--- a/ant-prepare.sh
+++ b/ant-prepare.sh
@@ -3,6 +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 project --path . --name F-Droid
 
 { echo -e "\nSuccessfully updated the main project.\n"; } 2>/dev/null
diff --git a/extern/nanohttpd b/extern/nanohttpd
index 58f73260e..73cb37f86 160000
--- a/extern/nanohttpd
+++ b/extern/nanohttpd
@@ -1 +1 @@
-Subproject commit 58f73260ed98df878bae1051dc8e6a0bce842fcb
+Subproject commit 73cb37f863c41b8f021019703d6453887b656dd6
diff --git a/project.properties b/project.properties
index d6e5f072f..252c5c7d2 100644
--- a/project.properties
+++ b/project.properties
@@ -5,3 +5,4 @@ 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
diff --git a/src/fi/iki/elonen/InternalRewrite.java b/src/fi/iki/elonen/InternalRewrite.java
deleted file mode 120000
index 1032b32ff..000000000
--- a/src/fi/iki/elonen/InternalRewrite.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../extern/nanohttpd/webserver/src/main/java/fi/iki/elonen/InternalRewrite.java
\ No newline at end of file
diff --git a/src/fi/iki/elonen/NanoHTTPD.java b/src/fi/iki/elonen/NanoHTTPD.java
deleted file mode 120000
index e901c0713..000000000
--- a/src/fi/iki/elonen/NanoHTTPD.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../extern/nanohttpd/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
\ No newline at end of file
diff --git a/src/fi/iki/elonen/ServerRunner.java b/src/fi/iki/elonen/ServerRunner.java
deleted file mode 120000
index 5e86528e1..000000000
--- a/src/fi/iki/elonen/ServerRunner.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../extern/nanohttpd/webserver/src/main/java/fi/iki/elonen/ServerRunner.java
\ No newline at end of file
diff --git a/src/fi/iki/elonen/WebServerPlugin.java b/src/fi/iki/elonen/WebServerPlugin.java
deleted file mode 120000
index e47bc1985..000000000
--- a/src/fi/iki/elonen/WebServerPlugin.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../extern/nanohttpd/webserver/src/main/java/fi/iki/elonen/WebServerPlugin.java
\ No newline at end of file
diff --git a/src/fi/iki/elonen/WebServerPluginInfo.java b/src/fi/iki/elonen/WebServerPluginInfo.java
deleted file mode 120000
index b50012005..000000000
--- a/src/fi/iki/elonen/WebServerPluginInfo.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../extern/nanohttpd/webserver/src/main/java/fi/iki/elonen/WebServerPluginInfo.java
\ No newline at end of file