Merge branch 'develop'

vgorloff · May 12, 2021 · 4a27bac · 4a27bac
2 parents 2b0e328 + 3c2cc95
commit 4a27bac
Show file tree

Hide file tree

Showing 33 changed files with 767 additions and 68 deletions.
diff --git a/.troubleshooting/stdlib/glibc.swiftmodule.rb b/.troubleshooting/stdlib/glibc.swiftmodule.rb
@@ -0,0 +1,95 @@
+#!/usr/bin/env ruby
+
+require_relative "../Troubleshooter.rb"
+
+class Builder < Troubleshooter
+   def initialize()
+      super(File.expand_path(File.dirname(__FILE__)))
+      @cmd = <<EOM
+cd /Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/stdlib/public/Platform
+&& /usr/local/Cellar/cmake/3.20.2/bin/cmake
+-E remove
+-f /Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/./lib/swift/android/Glibc.swiftmodule/armv7-unknown-linux-android.swiftmodule
+
+/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/./lib/swift/android/Glibc.swiftmodule/armv7-unknown-linux-android.swiftdoc
+
+/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/./lib/swift/android/Glibc.swiftmodule/armv7-unknown-linux-android.swiftinterface
+
+&& /usr/local/Cellar/cmake/3.20.2/bin/cmake
+-E make_directory
+/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/./lib/swift/android
+/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/./lib/swift/android/Glibc.swiftmodule
+
+&& /usr/local/Frameworks/Python.framework/Versions/3.9/bin/python3.9
+/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Sources/swift/utils/line-directive
+@/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/stdlib/public/Platform/d25a9f73a3c8795b4bd2684f6063aac749d2597e.txt
+-- /Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-host/swift/bin/swiftc
+-emit-module
+-o /Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/./lib/swift/android/Glibc.swiftmodule/armv7-unknown-linux-android.swiftmodule
+-v
+-avoid-emit-module-source-info
+-sdk /Volumes/Shared/Data/Android/sdk/ndk/21.4.7075529/toolchains/llvm/prebuilt/darwin-x86_64/sysroot
+-target armv7-unknown-linux-androideabi
+-resource-dir /Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/./lib/swift
+-O -D SWIFT_RUNTIME_OS_VERSIONING -module-cache-path /Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/./module-cache
+-no-link-objc-runtime
+-enable-library-evolution
+-Xfrontend
+-enforce-exclusivity=unchecked
+-module-name Glibc
+-swift-version 5
+-swift-version 5
+-autolink-force-load
+-runtime-compatibility-version none
+-disable-autolinking-runtime-compatibility-dynamic-replacements
+-warn-swift3-objc-inference-complete
+-Xfrontend -verify-syntax-tree
+-sdk /Volumes/Shared/Data/Android/sdk/ndk/21.4.7075529/sysroot
+-warn-implicit-overrides
+-module-link-name swiftGlibc
+-whole-module-optimization
+-parse-as-library -I /Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/./lib/swift/android
+-emit-module-interface-path /Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/./lib/swift/android/Glibc.swiftmodule/armv7-unknown-linux-android.swiftinterface
+-Xfrontend -experimental-skip-non-inlinable-function-bodies @/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/stdlib/public/Platform/d25a9f73a3c8795b4bd2684f6063aac749d2597e.txt
+EOM
+
+@cmd = <<EOM
+/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-host/swift/bin/swift-frontend
+-frontend
+-emit-module
+/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Sources/swift/stdlib/public/Platform/Platform.swift
+/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Sources/swift/stdlib/public/Platform/TiocConstants.swift
+/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Sources/swift/stdlib/public/Platform/POSIXError.swift
+/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/stdlib/public/Platform/4/tgmath.swift
+/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/stdlib/public/Platform/4/Glibc.swift
+
+# -supplementary-output-file-map /var/folders/7l/skdbvw8s5jx0g9vs5_qrkync0000gt/T/supplementaryOutputs-6a423e
+-target armv7-unknown-linux-android
+-disable-objc-interop
+-sdk /Volumes/Shared/Data/Android/sdk/ndk/21.4.7075529/toolchains/llvm/prebuilt/darwin-x86_64/sysroot
+-I /Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/./lib/swift/android
+-autolink-force-load
+-warn-swift3-objc-inference-complete
+-warn-implicit-overrides
+-enable-library-evolution
+-module-cache-path /Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/./module-cache
+-module-link-name swiftGlibc
+-resource-dir /Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/./lib/swift
+-swift-version 5
+-O
+-D SWIFT_RUNTIME_OS_VERSIONING
+-enforce-exclusivity=unchecked
+-verify-syntax-tree
+-experimental-skip-non-inlinable-function-bodies
+-parse-as-library
+-module-name Glibc
+-o /Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/./lib/swift/android/Glibc.swiftmodule/armv7-unknown-linux-android.swiftmodule
+-runtime-compatibility-version none
+-disable-autolinking-runtime-compatibility-dynamic-replacements
+
+EOM
+   end
+
+end
+
+Builder.new().build()
diff --git a/.troubleshooting/stdlib/libswiftRemoteMirror.rb b/.troubleshooting/stdlib/libswiftRemoteMirror.rb
@@ -0,0 +1,178 @@
+#!/usr/bin/env ruby
+
+require_relative "../Troubleshooter.rb"
+
+class Builder < Troubleshooter
+   def initialize()
+      super(File.expand_path(File.dirname(__FILE__)))
+      @cmd = <<EOM
+
+      cd /Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib &&
+/Volumes/Shared/Data/Android/sdk/ndk/21.4.7075529/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang --target=armv7-none-linux-androideabi21 --gcc-toolchain=/Volumes/Shared/Data/Android/sdk/ndk/21.4.7075529/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Volumes/Shared/Data/Android/sdk/ndk/21.4.7075529/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -fPIC -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -march=armv7-a -mthumb -Wformat -Werror=format-security  -fPIC -Werror=date-time -Werror=unguarded-availability-new -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wmissing-field-initializers -Wimplicit-fallthrough -Wcovered-switch-default -Wdelete-non-virtual-dtor -Wstring-conversion -fdiagnostics-color -ffunction-sections -fdata-sections -Oz  -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libgcc_real.a -Wl,--exclude-libs,libatomic.a -static-libstdc++ -Wl,--build-id -Wl,--fatal-warnings -Wl,--exclude-libs,libunwind.a -Wl,--no-undefined -Qunused-arguments     -shared -Wl,-soname,libswiftRemoteMirror.so -target armv7-unknown-linux-androideabi21 --sysroot=/Volumes/Shared/Data/Android/sdk/ndk/21.4.7075529/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -B /Volumes/Shared/Data/Android/sdk/ndk/21.4.7075529/toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64/arm-linux-androideabi/bin -lm -fuse-ld=gold -shared  -o lib/swift/android/armv7/libswiftRemoteMirror.so stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/ErrorHandling.cpp.o stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/Hashing.cpp.o stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/MemAlloc.cpp.o stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/SmallPtrSet.cpp.o stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/SmallVector.cpp.o stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/StringRef.cpp.o stdlib/public/SwiftRemoteMirror/CMakeFiles/swiftRemoteMirror-android-armv7.dir/SwiftRemoteMirror.cpp.o -L/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-host/llvm-project/./lib   -L/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/./lib/swift/android/armv7   -L/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-host/swift/bin/../lib/swift/android/armv7   -L/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-host/swift/bin/../lib/swift/android   -L/Volumes/Shared/Data/Android/sdk/ndk/21.4.7075529/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/swift   -L/Volumes/Shared/Data/Android/sdk/ndk/21.4.7075529/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/../lib/gcc/arm-linux-androideabi/4.9.x   -L/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Install/darwin-armv7a/icu/lib
+
+# -L/Volumes/Shared/Data/Android/sdk/ndk/21.4.7075529/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi
+
+lib/swift/android/armv7/libswiftReflection.a  -ldl  -llog  /Volumes/Shared/Data/Android/sdk/ndk/21.4.7075529/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/libc++abi.a  -lc++_shared  -licui18nswift  -licuucswift  -latomic -lm
+EOM
+      @_cmd = <<EOM
+      cd /Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib &&
+
+      /Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang
+
+      -v
+
+      --target=armv7-none-linux-androideabi23
+      --gcc-toolchain=/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64
+      --sysroot=/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/sysroot
+      -fPIC -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables
+      -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2
+      -march=armv7-a -mthumb -Wformat -Werror=format-security
+      -D__ANDROID_API__=23 -fPIC -Werror=date-time -Werror=unguarded-availability-new -Wall -Wextra
+      -Wno-unused-parameter -Wwrite-strings -Wmissing-field-initializers
+      -Wimplicit-fallthrough -Wcovered-switch-default -Wdelete-non-virtual-dtor
+      -Wstring-conversion -fdiagnostics-color -ffunction-sections -fdata-sections
+      -Oz
+      -Wl,--exclude-libs,libgcc.a
+      -Wl,--exclude-libs,libgcc_real.a
+      -Wl,--exclude-libs,libatomic.a
+      -static-libstdc++
+
+      -Wl,-v
+
+      -Wl,--build-id=sha1
+      -Wl,--no-rosegment
+      -Wl,--fatal-warnings
+      -Wl,--exclude-libs,libunwind.a
+      -Wl,--no-undefined
+      -Qunused-arguments
+      -Wl,--color-diagnostics
+      -shared
+      -Wl,-soname,libswiftRemoteMirror.so
+
+      # -target armv7-unknown-linux-androideabi23
+      # --sysroot=/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/sysroot
+
+      -lm -fuse-ld=lld
+      -shared
+      -o lib/swift/android/armv7/libswiftRemoteMirror.so
+
+      stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/ErrorHandling.cpp.o
+      stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/Hashing.cpp.o
+      stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/MemAlloc.cpp.o
+      stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/SmallPtrSet.cpp.o
+      stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/SmallVector.cpp.o
+      stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/StringRef.cpp.o
+      stdlib/public/SwiftRemoteMirror/CMakeFiles/swiftRemoteMirror-android-armv7.dir/SwiftRemoteMirror.cpp.o
+
+      -L/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-host/llvm-project/./lib
+      -L/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/./lib/swift/android/armv7
+      -L/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-host/swift/bin/../lib/swift/android/armv7
+      -L/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-host/swift/bin/../lib/swift/android
+      -L/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Install/darwin-armv7a/icu/lib
+
+      -L/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/swift
+      -L/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/lib/gcc/arm-linux-androideabi/4.9.x
+
+
+
+      # Below line breaks the build. See: https://github.com/vgorloff/swift-everywhere-toolchain/issues/113
+      # -L/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi
+
+
+
+
+      lib/swift/android/armv7/libswiftReflection.a
+      -ldl
+      -llog
+      /Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/libc++abi.a
+      -lc++_shared
+      -licui18nswift
+      -licuucswift
+      -latomic
+      -lm
+EOM
+
+      @_cmd = <<EOM
+
+cd /Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib &&
+
+/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/bin/ld.lld \
+
+-error-limit=0
+
+--sysroot=/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/sysroot
+-z noexecstack -EL
+--warn-shared-textrel
+-z now
+-z relro
+-z max-page-size=4096
+-X --hash-style=gnu
+--enable-new-dtags
+--eh-frame-hdr
+-m armelf_linux_eabi
+-o lib/swift/android/armv7/libswiftRemoteMirror.so
+
+/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/23/crtbegin_so.o
+
+-L/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-host/llvm-project/./lib
+-L/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-armv7a/swift-stdlib/./lib/swift/android/armv7
+-L/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-host/swift/bin/../lib/swift/android/armv7
+-L/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Build/darwin-host/swift/bin/../lib/swift/android
+-L/Volumes/Shared/Git/MyProjects/swift-everywhere-toolchain/ToolChain/Install/darwin-armv7a/icu/lib
+
+-L/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/lib/gcc/arm-linux-androideabi/4.9.x
+-L/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi
+-L/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/lib64/clang/11.0.5/lib/linux/arm
+-L/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb
+-L/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/../lib/armv7-a/thumb
+-L/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/23
+-L/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi
+-L/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/../lib
+-L/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/../../lib
+-L/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb
+-L/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib
+
+--exclude-libs libgcc.a
+--exclude-libs libgcc_real.a
+--exclude-libs libatomic.a
+--exclude-libs libunwind.a
+
+--build-id=sha1
+--no-rosegment
+--fatal-warnings
+-color-diagnostics
+
+-v
+--no-undefined
+
+-soname libswiftRemoteMirror.so
+-lm
+stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/ErrorHandling.cpp.o
+stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/Hashing.cpp.o
+stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/MemAlloc.cpp.o
+stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/SmallPtrSet.cpp.o
+stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/SmallVector.cpp.o
+stdlib/public/LLVMSupport/CMakeFiles/swiftLLVMSupport-android-armv7.dir/StringRef.cpp.o
+stdlib/public/SwiftRemoteMirror/CMakeFiles/swiftRemoteMirror-android-armv7.dir/SwiftRemoteMirror.cpp.o
+lib/swift/android/armv7/libswiftReflection.a
+-ldl
+-llog
+-shared
+/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/libc++abi.a
+-lc++_shared
+-licui18nswift
+-licuucswift
+-latomic
+-lm
+-lgcc
+-ldl
+-lc
+-lgcc
+-ldl
+/Volumes/Shared/Data/Android/sdk/ndk/22.1.7171670/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/23/crtend_so.o
+EOM
+   end
+
+end
+
+Builder.new().build()
diff --git a/Assets/android-copy-libs b/Assets/android-copy-libs
@@ -47,7 +47,7 @@ function usage {
   echo ""
   echo "   <target> Is one of the following:"
   echo ""
-  echo "     - armv7-none-linux-androideabi"
+  echo "     - armv7-unknown-linux-android"
   echo "     - aarch64-unknown-linux-android"
   echo "     - i686-unknown-linux-android"
   echo "     - x86_64-unknown-linux-android"
@@ -89,7 +89,7 @@ if [ -z "$SaArchTarget" ]; then
   exit 1
 fi
 
-if [ "$SaArchTarget" = "armv7-none-linux-androideabi" ] || [ "$SaArchTarget" = "aarch64-unknown-linux-android" ] || [ "$SaArchTarget" = "i686-unknown-linux-android" ] || [ "$SaArchTarget" = "x86_64-unknown-linux-android" ]; then
+if [ "$SaArchTarget" = "armv7-unknown-linux-android" ] || [ "$SaArchTarget" = "aarch64-unknown-linux-android" ] || [ "$SaArchTarget" = "i686-unknown-linux-android" ] || [ "$SaArchTarget" = "x86_64-unknown-linux-android" ]; then
   true
 else
   echo "Unknown target \"$SaArchTarget\""
@@ -104,7 +104,7 @@ if [ -z "$SaOutput" ]; then
 fi
 
 case $SaArchTarget in
-  armv7-none-linux-androideabi)
+  armv7-unknown-linux-android)
   SaSwiftArch=armv7
   SaCppArch=armeabi-v7a
   ;;

diff --git a/Assets/android-swift-build b/Assets/android-swift-build
@@ -42,7 +42,7 @@ function usage {
   echo ""
   echo "   <target> Is one of the following:"
   echo ""
-  echo "     - armv7-none-linux-androideabi"
+  echo "     - armv7-unknown-linux-android"
   echo "     - aarch64-unknown-linux-android"
   echo "     - i686-unknown-linux-android"
   echo "     - x86_64-unknown-linux-android"
@@ -83,7 +83,7 @@ if [ -z "$SaArchTarget" ]; then
   exit 1
 fi
 
-if [ "$SaArchTarget" = "armv7-none-linux-androideabi" ] || [ "$SaArchTarget" = "aarch64-unknown-linux-android" ] || [ "$SaArchTarget" = "i686-unknown-linux-android" ] || [ "$SaArchTarget" = "x86_64-unknown-linux-android" ]; then
+if [ "$SaArchTarget" = "armv7-unknown-linux-android" ] || [ "$SaArchTarget" = "aarch64-unknown-linux-android" ] || [ "$SaArchTarget" = "i686-unknown-linux-android" ] || [ "$SaArchTarget" = "x86_64-unknown-linux-android" ]; then
   true
 else
   echo "Unknown target \"$SaArchTarget\""
@@ -92,7 +92,7 @@ else
 fi
 
 case $SaArchTarget in
-  armv7-none-linux-androideabi)
+  armv7-unknown-linux-android)
   SaNdkArch="arm-linux-androideabi"
   ;;
   aarch64-unknown-linux-android)