diff --git a/.gitignore b/.gitignore index db386f6..48a00fb 100644 --- a/.gitignore +++ b/.gitignore @@ -39,7 +39,6 @@ zerotier-one.port *.exe *.bin *.framework -*.jar bin/ gen/ diff --git a/build.sh b/build.sh index ceba2ef..b3389c5 100755 --- a/build.sh +++ b/build.sh @@ -584,7 +584,8 @@ android-aar() rm -rf ext/ZeroTierOne/ext/miniupnpc/VERSION export PATH=$ANDROID_HOME/cmdline-tools/tools/bin:$PATH # Copy source files into project - cp -f src/bindings/java/*.java ${ANDROID_PKG_PROJ_DIR}/app/src/main/java/com/zerotier/libzt + mkdir -p ${ANDROID_PKG_PROJ_DIR}/app/src/main/java/com/zerotier/sockets + cp -f src/bindings/java/*.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" diff --git a/pkg/android/app/src/main/java/com/zerotier/libzt/README b/pkg/android/app/src/main/java/com/zerotier/libzt/README deleted file mode 100644 index 4d871fb..0000000 --- a/pkg/android/app/src/main/java/com/zerotier/libzt/README +++ /dev/null @@ -1 +0,0 @@ -Before build, Java wrapper sources will be copied here diff --git a/pkg/android/gradle/wrapper/gradle-wrapper.jar b/pkg/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7a3265e Binary files /dev/null and b/pkg/android/gradle/wrapper/gradle-wrapper.jar differ