diff options
| author | Joseph Henry <[email protected]> | 2023-06-02 13:33:33 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-06-02 13:33:33 -0700 |
| commit | 4aa57d7360c941eba5ab5377311ef660c48f490e (patch) | |
| tree | 89a40492f466d85206192d404e2e36cdee46895c | |
| parent | 03670cc18baa432c6d1401cb0192bd16cb740c9b (diff) | |
| parent | 0d81706227610bed58be8268bed95cded3d02a14 (diff) | |
Merge pull request #222 from zerotier/brenton/fix-android-build
Fix a few issues with Android build
| -rwxr-xr-x | build.sh | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -596,18 +596,12 @@ android-aar() PKG_OUTPUT_DIR=$BUILD_OUTPUT_DIR/$TARGET_PLATFORM-$TARGET_MACHINE_TYPE-$ARTIFACT-$BUILD_TYPE mkdir -p $CACHE_DIR mkdir -p $PKG_OUTPUT_DIR - # Unsure why, but Gradle's build script chokes on this non-source file now - rm -rf ext/ZeroTierOne/ext/miniupnpc/VERSION - export PATH=$ANDROID_HOME/cmdline-tools/tools/bin:$PATH - # Copy source files into project - mkdir -p ${ANDROID_PKG_PROJ_DIR}/app/src/main/java/com/zerotier/sockets - cp -f src/bindings/java/com/zerotier/sockets/*.java ${ANDROID_PKG_PROJ_DIR}/app/src/main/java/com/zerotier/sockets # Build UPPERCASE_BUILD_TYPE="$(tr '[:lower:]' '[:upper:]' <<< ${BUILD_TYPE:0:1})${BUILD_TYPE:1}" CMAKE_FLAGS="-D${CMAKE_SWITCH}=1 -D${CMAKE_SWITCH}=ON" cd $ANDROID_PKG_PROJ_DIR ./gradlew $GRADLE_ARGS assemble$UPPERCASE_BUILD_TYPE # assembleRelease / assembleDebug - mv $ANDROID_PKG_PROJ_DIR/app/build/outputs/aar/*.aar \ + cp $ANDROID_PKG_PROJ_DIR/app/build/outputs/aar/*.aar \ $PKG_OUTPUT_DIR/libzt-$BUILD_TYPE.aar cd - echo -e "\n - Build cache : $CACHE_DIR\n - Build output : $BUILD_OUTPUT_DIR\n" |