From ae3cb5451473756eee32cb9b493e106d866537f1 Mon Sep 17 00:00:00 2001 From: user Date: Sun, 5 Jul 2020 13:13:00 +0800 Subject: [PATCH 1/4] mostly closes https://github.com/PurpleI2P/i2pd/issues/1541 --- docs/devs/building/android.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/devs/building/android.md b/docs/devs/building/android.md index a833dc2..f2fa7c0 100644 --- a/docs/devs/building/android.md +++ b/docs/devs/building/android.md @@ -6,7 +6,7 @@ There are two versions: with QT and without QT. Pre-requisites -------------- -You need to install Android SDK, NDK and QT with android support. +You need to install Android SDK and NDK. For QT version, you also need QT with android support. - [SDK](https://developer.android.com/studio/index.html) (choose command line tools only, and make sure you installed "Android SDK Build-Tools") - [NDK](https://developer.android.com/ndk/downloads/index.html) @@ -28,7 +28,7 @@ Dependencies Take following pre-compiled binaries from PurpleI2P's repositories. - git clone https://github.com/PurpleI2P/Boost-for-Android-Prebuilt.git + git clone https://github.com/PurpleI2P/Boost-for-Android-Prebuilt.git -b boost-1_72_0 git clone https://github.com/PurpleI2P/OpenSSL-for-Android-Prebuilt.git git clone https://github.com/PurpleI2P/MiniUPnP-for-Android-Prebuilt.git git clone https://github.com/PurpleI2P/android-ifaddrs.git @@ -53,8 +53,8 @@ Building the app without QT --------------------------- - Change line `I2PD_LIBS_PATH` in `android/jni/Application.mk` to an actual path where you put the dependencies to -- Create or edit file 'local.properties'. Place 'sdk.dir=' and 'ndk.dir=' -- Run `gradle clean assembleDebug` from `android` folder +- Create or edit file 'local.properties'. Place 'sdk.dir=``' and 'ndk.dir=``' +- Run `gradle clean cleanBuildCache assembleDebug` from `android` folder - You will find an .apk file in `android/build/outputs/apk` folder Creating release .apk @@ -86,7 +86,7 @@ Change file 'build.gradle': + signingConfig signingConfigs.release ``` -Run `gradle clean assembleRelease` +Run `gradle clean cleanBuildCache assembleRelease` Building executable android binary ------------------------------ From 01968e2ae56b6f89f7b6016639fae95e3ceb31c2 Mon Sep 17 00:00:00 2001 From: user Date: Sun, 5 Jul 2020 13:47:44 +0800 Subject: [PATCH 2/4] closes https://github.com/PurpleI2P/i2pd/issues/1541 together with https://github.com/PurpleI2P/i2pd/pull/1542 --- docs/devs/building/android.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/devs/building/android.md b/docs/devs/building/android.md index f2fa7c0..f5f8b04 100644 --- a/docs/devs/building/android.md +++ b/docs/devs/building/android.md @@ -37,9 +37,9 @@ Prepare Android SDK and install required packages mkdir android-sdk cd android-sdk - wget - unzip sdk-tools-XXXXXX-XXXXXX.zip - ./tools/bin/sdkmanager "build-tools;25.0.3" "platforms;android-14" "platforms;android-25" "platform-tools" + wget -t0 `` + unzip sdk-tools-XXXXXX-XXXXXX.zip -d cmdline-tools + ./cmdline-tools/tools/bin/sdkmanager "build-tools;25.0.3" "platforms;android-14" "platforms;android-25" "platform-tools" Building the app with QT ------------------------ From 20cfd5a2f94d0ac954e9940ed352a803b05851c1 Mon Sep 17 00:00:00 2001 From: user Date: Sun, 5 Jul 2020 13:58:36 +0800 Subject: [PATCH 3/4] fixed .md escapes markup --- docs/devs/building/android.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/devs/building/android.md b/docs/devs/building/android.md index f5f8b04..737181f 100644 --- a/docs/devs/building/android.md +++ b/docs/devs/building/android.md @@ -37,7 +37,7 @@ Prepare Android SDK and install required packages mkdir android-sdk cd android-sdk - wget -t0 `` + wget -t0 unzip sdk-tools-XXXXXX-XXXXXX.zip -d cmdline-tools ./cmdline-tools/tools/bin/sdkmanager "build-tools;25.0.3" "platforms;android-14" "platforms;android-25" "platform-tools" From ca98124d8415d59dbdf8067b2dc12148f910534c Mon Sep 17 00:00:00 2001 From: user Date: Sun, 5 Jul 2020 14:00:44 +0800 Subject: [PATCH 4/4] more recent name for commandlinetools-*.zip archive --- docs/devs/building/android.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/devs/building/android.md b/docs/devs/building/android.md index 737181f..da25795 100644 --- a/docs/devs/building/android.md +++ b/docs/devs/building/android.md @@ -38,7 +38,7 @@ Prepare Android SDK and install required packages mkdir android-sdk cd android-sdk wget -t0 - unzip sdk-tools-XXXXXX-XXXXXX.zip -d cmdline-tools + unzip commandlinetools-XXXXXX-XXXXXX.zip -d cmdline-tools ./cmdline-tools/tools/bin/sdkmanager "build-tools;25.0.3" "platforms;android-14" "platforms;android-25" "platform-tools" Building the app with QT