Verified Commit 7371b779 authored by Torsten Grote's avatar Torsten Grote
Browse files

Upgrade to obfs4proxy 0.0.11 and also build 64-bit versions

parent 64fa24ee
......@@ -85,6 +85,11 @@ def build_android(versions):
env['GOARM'] = "7"
build_android_arch(versions, env, "arm-linux-androideabi", ndk_arch="arm", pie=True)
env = os.environ.copy()
env['GOARCH'] = "arm64"
env['GOARM'] = "7"
build_android_arch(versions, env, "aarch64-linux-android", ndk_arch="arm64", pie=True)
env = os.environ.copy()
env['GOARCH'] = "386"
build_android_arch(versions, env, "i686-linux-android", ndk_arch="x86", pie=False)
......@@ -93,6 +98,10 @@ def build_android(versions):
env['GOARCH'] = "386"
build_android_arch(versions, env, "i686-linux-android", ndk_arch="x86", pie=True)
env = os.environ.copy()
env['GOARCH'] = "amd64"
build_android_arch(versions, env, "x86_64-linux-android", ndk_arch="x86_64", pie=True)
def build_android_arch(versions, env, tool, ndk_arch, pie):
toolchain = os.path.join("toolchain", ndk_arch)
......@@ -126,8 +135,8 @@ def build_linux(versions):
def package_android(versions):
file_list = ['obfs4proxy_arm.zip', 'obfs4proxy_arm_pie.zip',
'obfs4proxy_x86.zip', 'obfs4proxy_x86_pie.zip']
file_list = ['obfs4proxy_arm.zip', 'obfs4proxy_arm_pie.zip', 'obfs4proxy_arm64_pie.zip',
'obfs4proxy_x86.zip', 'obfs4proxy_x86_pie.zip', 'obfs4proxy_x86_64_pie.zip']
package(versions, file_list, android=True)
......
{
"obfs4proxy": {
"0.0.11": {
"repo_url": "https://git.torproject.org/pluggable-transports/obfs4.git",
"revision": "obfs4proxy-0.0.11",
"build_path": "obfs4proxy",
"go": {
"version": "go1.11.5",
"sha256": "bc1ef02bb1668835db1390a2e478dcbccb5dd16911691af9d75184bbe5aa943e"
},
"ndk": {
"url": "https://dl.google.com/android/repository/android-ndk-r18-linux-x86_64.zip",
"revision": "18.0.5002713",
"sha256": "c413dd014edc37f822d0dc88fabc05b64232d07d5c6e9345224e47073fdf140b"
}
},
"0.0.9": {
"repo_url": "https://git.torproject.org/pluggable-transports/obfs4.git",
"revision": "obfs4proxy-0.0.9",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment