Dev: add copying of binary artifacts

Author: andriydruk

src/bash/swift-build.sh

@@ -18,7 +18,7 @@ if [ ! -d "$XCODE_TOOLCHAIN" ]; then
 fi
 
 export BUILD_ANDROID=1
-ANDROID_API_LEVEL="${SWIFT_ANDROID_API_LEVEL:=28}"
+ANDROID_API_LEVEL="${SWIFT_ANDROID_API_LEVEL:=29}"
 
 export CC="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang"
 export CXX="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++"

src/python/utils.py

@@ -121,9 +121,9 @@ def setup(cls, configuration):
 
     @classmethod
     @memoized
-    def triple(cls):
+    def target(cls):
         arch = os.environ.get("SWIFT_ANDROID_ARCH")
-        level = os.environ.get("SWIFT_ANDROID_API_LEVEL", "24")
+        level = os.environ.get("SWIFT_ANDROID_API_LEVEL", "29")
 
         if arch == "aarch64" or arch is None:
             return "aarch64-unknown-linux-android{}".format(level)
@@ -136,6 +136,22 @@ def triple(cls):
         else:
             raise Exception("Unknown arch '{}'".format(arch))
 
+    @classmethod
+    @memoized
+    def tripple(cls):
+        arch = os.environ.get("SWIFT_ANDROID_ARCH")
+
+        if arch == "aarch64" or arch is None:
+            return "aarch64-linux-android"
+        if arch == "x86_64":
+            return "x86_64-linux-android"
+        elif arch == "armv7":
+            return "armv7-linux-androideabi"
+        elif arch == "i686":
+            return "i686-linux-android"
+        else:
+            raise Exception("Unknown arch '{}'".format(arch))
+
     @classmethod
     @memoized
     def abi(cls):
@@ -193,26 +209,17 @@ def build_root(cls):
     @classmethod
     @memoized
     def build_dir(cls):
-        return os.path.join(cls.build_root(), BuildConfig.triple(), BuildConfig.configuration())
-
-    @classmethod
-    def external_build_root(cls, name):
-        return os.path.join(cls.build_root(), "external-build", name)
+        return os.path.join(cls.build_root(), BuildConfig.target(), BuildConfig.configuration())
 
     @classmethod
     @memoized
     def external_out_dir(cls):
-        return os.path.join(cls.build_root(), "jniLibs")
-
-    @classmethod
-    @memoized
-    def external_include_dir(cls):
-        return os.path.join(cls.external_out_dir(), "include")
+        return os.path.join(cls.build_root(), "artifacts/*/*/*")
 
     @classmethod
     @memoized
     def external_libs_dir(cls):
-        return os.path.join(cls.external_out_dir(), BuildConfig.abi())
+        return os.path.join(cls.external_out_dir(), BuildConfig.tripple())
 
 class TestingApp(object):
     @classmethod