Merge pull request #230 from zerotier/brenton/fix-no-such-file-or-directory-error

fix 'No such file or directory' error

2 files changed, 7 insertions, 1 deletions

diff --git a/build.sh b/build.sh
index 31fb4ea..774411b 100755
--- a/build.sh
+++ b/build.sh
@@ -603,7 +603,7 @@ android-aar()
     CMAKE_FLAGS="-D${CMAKE_SWITCH}=1 -D${CMAKE_SWITCH}=ON"
     cd $ANDROID_PKG_PROJ_DIR
     ./gradlew $GRADLE_ARGS assemble$UPPERCASE_BUILD_TYPE # assembleRelease / assembleDebug
-    cp $ANDROID_PKG_PROJ_DIR/app/build/outputs/aar/*.aar \
+    cp $ANDROID_PKG_PROJ_DIR/app/build/outputs/aar/libzt-$BUILD_TYPE.aar \
         $PKG_OUTPUT_DIR/libzt-$BUILD_TYPE.aar
     cd -
     echo -e "\n - Build cache  : $CACHE_DIR\n - Build output : $BUILD_OUTPUT_DIR\n"
diff --git a/pkg/android/app/build.gradle b/pkg/android/app/build.gradle
index 0c78c42..06c81eb 100644
--- a/pkg/android/app/build.gradle
+++ b/pkg/android/app/build.gradle
@@ -46,6 +46,12 @@ android {
             }
         }
     }
+
+    android.libraryVariants.all { variant ->
+        variant.outputs.all { file ->
+            file.outputFileName = "libzt-${variant.buildType.name}.aar"
+        }
+    }
 }
 
 dependencies {