Skip to content

Commit 6393bdc

Browse files
committed
doc: Move Android dependencies guide into build-android.md
1 parent ac323a7 commit 6393bdc

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

depends/README.md

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Common `host-platform-triplet`s for cross compilation are:
4141
- `i686-linux-android` for Android x86 32 bit
4242
- `x86_64-linux-android` for Android x86 64 bit
4343

44-
The paths are automatically configured and no other options are needed unless targeting [Android](#Android).
44+
The paths are automatically configured and no other options are needed unless targeting [Android](../doc/build-android.md).
4545

4646
### Install the required dependencies: Ubuntu & Debian
4747

@@ -133,18 +133,6 @@ options will be passed to bitcoin's configure. In this case, `--disable-wallet`.
133133
download-linux: run 'make download-linux' to fetch all sources needed for linux builds
134134

135135

136-
### Android
137-
138-
Before proceeding with an Android build one needs to get the [Android SDK](https://developer.android.com/studio) and use the "SDK Manager" tool to download the NDK and one or more "Platform packages" (these are Android versions and have a corresponding API level).
139-
In order to build `ANDROID_API_LEVEL` (API level corresponding to the Android version targeted, e.g. Android 9.0 Pie is 28 and its "Platform package" needs to be available) and `ANDROID_TOOLCHAIN_BIN` (path to toolchain binaries depending on the platform the build is being performed on) need to be set.
140-
141-
API levels from 24 to 29 have been tested to work.
142-
143-
If the build includes Qt, environment variables `ANDROID_SDK` and `ANDROID_NDK` need to be set as well but can otherwise be omitted.
144-
This is an example command for a default build with no disabled dependencies:
145-
146-
ANDROID_SDK=/home/user/Android/Sdk ANDROID_NDK=/home/user/Android/Sdk/ndk-bundle make HOST=aarch64-linux-android ANDROID_API_LEVEL=28 ANDROID_TOOLCHAIN_BIN=/home/user/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin
147-
148136
### Other documentation
149137

150138
- [description.md](description.md): General description of the depends system

doc/build-android.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,19 @@ ANDROID BUILD NOTES
33

44
This guide describes how to build and package the `bitcoin-qt` GUI for Android on Linux and macOS.
55

6-
## Preparation
76

8-
You will need to get the Android NDK and build dependencies for Android as described in [depends/README.md](../depends/README.md).
7+
## Dependencies
8+
9+
Before proceeding with an Android build one needs to get the [Android SDK](https://developer.android.com/studio) and use the "SDK Manager" tool to download the NDK and one or more "Platform packages" (these are Android versions and have a corresponding API level).
10+
In order to build `ANDROID_API_LEVEL` (API level corresponding to the Android version targeted, e.g. Android 9.0 Pie is 28 and its "Platform package" needs to be available) and `ANDROID_TOOLCHAIN_BIN` (path to toolchain binaries depending on the platform the build is being performed on) need to be set.
11+
12+
API levels from 24 to 29 have been tested to work.
13+
14+
If the build includes Qt, environment variables `ANDROID_SDK` and `ANDROID_NDK` need to be set as well but can otherwise be omitted.
15+
This is an example command for a default build with no disabled dependencies:
16+
17+
ANDROID_SDK=/home/user/Android/Sdk ANDROID_NDK=/home/user/Android/Sdk/ndk-bundle make HOST=aarch64-linux-android ANDROID_API_LEVEL=28 ANDROID_TOOLCHAIN_BIN=/home/user/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin
18+
919

1020
## Building and packaging
1121

0 commit comments

Comments
 (0)