Merge pull request #374 from adam-p/ios-beta

Disable private plugins

ConsoleClient/make.bash

@@ -12,7 +12,7 @@ EXE_BASENAME="psiphon-tunnel-core"
 # The "OPENSSL" tag enables support of OpenSSL for use by IndistinguishableTLS.
 # This needs to be outside of prepare_build because it's used by go-get.
 
-PRIVATE_PLUGINS_TAG="PRIVATE_PLUGINS"
+PRIVATE_PLUGINS_TAG=""
 BUILD_TAGS="${PRIVATE_PLUGINS_TAG}"
 WINDOWS_BUILD_TAGS="OPENSSL ${BUILD_TAGS}"
 LINUX_BUILD_TAGS="${BUILD_TAGS}"

MobileLibrary/Android/make.bash

@@ -9,7 +9,7 @@ fi
 
 # The "OPENSSL" tag enables support of OpenSSL for use by IndistinguishableTLS.
 
-PRIVATE_PLUGINS_TAG="PRIVATE_PLUGINS"
+PRIVATE_PLUGINS_TAG=""
 BUILD_TAGS="OPENSSL ${PRIVATE_PLUGINS_TAG}"
 
 # Don't use '-u' to force updates because the docker builds always pull

MobileLibrary/iOS/build-psiphon-framework.sh

@@ -38,9 +38,7 @@ INTERMEDIATE_OUPUT_DIR="${BASE_DIR}/PsiphonTunnel/PsiphonTunnel"
 INTERMEDIATE_OUPUT_FILE="${FRAMEWORK}.framework"
 FRAMEWORK_BINARY="${INTERMEDIATE_OUPUT_DIR}/${INTERMEDIATE_OUPUT_FILE}/Versions/A/${FRAMEWORK}"
 
-# The "OPENSSL" tag enables support of OpenSSL for use by IndistinguishableTLS.
-
-PRIVATE_PLUGINS_TAG="PRIVATE_PLUGINS"
+PRIVATE_PLUGINS_TAG=""
 if [[ ${FORCE_PRIVATE_PLUGINS} == true ]]; then PRIVATE_PLUGINS_TAG="PRIVATE_PLUGINS"; fi
 BUILD_TAGS="IOS ${PRIVATE_PLUGINS_TAG}"
 

Server/make.bash

@@ -10,7 +10,7 @@ if [ ! -f make.bash ]; then
   exit 1
 fi
 
-PRIVATE_PLUGINS_TAG="PRIVATE_PLUGINS"
+PRIVATE_PLUGINS_TAG=""
 BUILD_TAGS="${PRIVATE_PLUGINS_TAG}"
 
 prepare_build () {