Merge pull request #105 from kuc/update-submodule

Update submodule and submodule settings
11 years ago · 0a820a4d62
3 changed files with 2 additions and 4 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,4 @@
				@@ -1,3 +1,4 @@
 [submodule "external/netcipher"]
 	path = external/netcipher
 	url = https://github.com/guardianproject/NetCipher.git
+	branch = master
--- a/external/netcipher
+++ b/external/netcipher
@ -1 +1 @@
				@@ -1 +1 @@
-Subproject commit ba9d13676669f7ef32df43a023a4d4a33385e013
+Subproject commit 7f09f5b8a6b7155ba60a7299cb46ee3df92945fe
--- a/setup-ant.sh
+++ b/setup-ant.sh
@ -8,6 +8,3 @@ projectdir=`dirname $f`
				@@ -8,6 +8,3 @@ projectdir=`dirname $f`
    android update lib-project -p $projectdir -t $target
 done
 android update project -p . --subprojects -t $target --name Lightning
-
-cp libs/android-support-v4.jar external/netcipher/libnetcipher/libs/android-support-v4.jar
-