Merge branch 'master' into vpn-app-selection-ui-improvements

guardianproject · Feb 27, 2018 · e459ec0 · e459ec0
2 parents a3f1697 + eddcba6
commit e459ec0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/INSTALL b/INSTALL
@@ -1,7 +1,7 @@
 
 Orbot: Android Onion Routing Robot
 ***********************************************
-Android is a freely licensed open-source application developed for the
+Orbot is a freely licensed open-source application developed for the
 Android platform. It acts as a front-end to the Tor binary application,
 and also provides an HTTP Proxy for connecting web browsers and other
 HTTP client applications into the Tor SOCKS interface.

diff --git a/orbotservice/src/main/jni/Android.mk b/orbotservice/src/main/jni/Android.mk
@@ -31,6 +31,13 @@ LOCAL_CFLAGS    := -Wall -O2 -I$(LOCAL_PATH)/pdnsd -DHAVE_STPCPY
 
 include $(BUILD_EXECUTABLE)
 
+.PHONY: $(CopyToAssets)
+
+CopyToAssets: libs/armeabi/pdnsd
+    $(shell mkdir -p assets/armeabi)
+    $(shell zip assets/armeabi/pdnsd.mp3 libs/armeabi/pdnsd)
+
+
 ########################################################
 ## libancillary
 ########################################################