From 004f3532a042947533eec47fac5163ee55d8944f Mon Sep 17 00:00:00 2001 From: R4SAS Date: Wed, 10 Feb 2021 17:57:31 +0300 Subject: [PATCH] move android binary build files to contrib Signed-off-by: R4SAS --- .../android_binary_only}/.gitignore | 0 .../android_binary_only}/jni/Android.mk | 0 .../android_binary_only}/jni/Application.mk | 2 +- contrib/android_binary_pack/build-archive | 11 +++++++---- 4 files changed, 8 insertions(+), 5 deletions(-) rename {android_binary_only => contrib/android_binary_only}/.gitignore (100%) rename {android_binary_only => contrib/android_binary_only}/jni/Android.mk (100%) mode change 100755 => 100644 rename {android_binary_only => contrib/android_binary_only}/jni/Application.mk (97%) mode change 100755 => 100644 diff --git a/android_binary_only/.gitignore b/contrib/android_binary_only/.gitignore similarity index 100% rename from android_binary_only/.gitignore rename to contrib/android_binary_only/.gitignore diff --git a/android_binary_only/jni/Android.mk b/contrib/android_binary_only/jni/Android.mk old mode 100755 new mode 100644 similarity index 100% rename from android_binary_only/jni/Android.mk rename to contrib/android_binary_only/jni/Android.mk diff --git a/android_binary_only/jni/Application.mk b/contrib/android_binary_only/jni/Application.mk old mode 100755 new mode 100644 similarity index 97% rename from android_binary_only/jni/Application.mk rename to contrib/android_binary_only/jni/Application.mk index bb4afac3..5d54645b --- a/android_binary_only/jni/Application.mk +++ b/contrib/android_binary_only/jni/Application.mk @@ -33,7 +33,7 @@ MINIUPNP_PATH = $(I2PD_LIBS_PATH)/MiniUPnP-for-Android-Prebuilt IFADDRS_PATH = $(I2PD_LIBS_PATH)/android-ifaddrs # don't change me -I2PD_SRC_PATH = $(PWD)/.. +I2PD_SRC_PATH = $(PWD)/../.. LIB_SRC_PATH = $(I2PD_SRC_PATH)/libi2pd LIB_CLIENT_SRC_PATH = $(I2PD_SRC_PATH)/libi2pd_client diff --git a/contrib/android_binary_pack/build-archive b/contrib/android_binary_pack/build-archive index c439dd7f..30f5b48d 100755 --- a/contrib/android_binary_pack/build-archive +++ b/contrib/android_binary_pack/build-archive @@ -20,7 +20,7 @@ if [ -d archive ]; then rm -r archive fi -if [ -f i2pd_*_android_binary.zip ]; then +if [ -f ../i2pd_*_android_binary.zip ]; then rm i2pd_*_android_binary.zip fi @@ -28,13 +28,16 @@ fi mkdir archive for ABI in "${!ABILIST[@]}"; do - if [ -f ../../android_binary_only/libs/${ABI}/i2pd ]; then - cp ../../android_binary_only/libs/${ABI}/i2pd archive/i2pd-${ABILIST[$ABI]} + if [ -f ../android_binary_only/libs/${ABI}/i2pd ]; then + cp ../android_binary_only/libs/${ABI}/i2pd archive/i2pd-${ABILIST[$ABI]} fi done cp i2pd archive/i2pd -cp -rH ../../android/assets/* archive/ +cp -rH ../android/assets/certificates archive/ +cp -rH ../android/assets/tunnels.conf.d archive/ +cp -H ../android/assets/i2pd.conf archive/ +cp -H ../android/assets/tunnels.conf archive/ # Compress files cd archive