The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

• #23611 (build: add LTO option to depends (no Qt) by fanquake)
• #22552 (build: Improve depends build system robustness by hebasto)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

Seems to work.

This PR is based on #22552, and only the last two commits belong to this one.

The dependency on #22552 could be eliminated by replacing $(qt_file_name) with a hardcoded value, but it will definitely bad for maintainability.

I can confirm this fixes my Android build issues. I haven't yet looked at the code.

Rebased 886e804 -> 5005c8e (pr22555.02 -> pr22555.03) due to the conflict with #22840.

Rebased 580efc5 -> 5f09974 (pr22555.11 -> pr22555.12).

Ok, I reworked this PR:

• dropped dependency on scary build: Improve depends build system robustness #22552
• dropped indentation refactoring commit

Should be a bit easier to review now :)

Friendly ping @achow101 @icota @fanquake

ACK 7d31069

Concept ~0. Adding more code to our depends and build systems, just to accommodate building for android in a "non-default" way is a bit meh. The people using this target with a custom SOURCES_PATH, which I'd assume is not many at all, could also just set QT_BASE_PATH.

Rebased 7d31069 -> 5d166df (pr22555.13 -> pr22555.14) due to the conflict with #24866.

@fanquake

Adding more code to our depends and build systems...

Also some lines have been removed from src/Makefile.qt.include :)

... just to accommodate building for android in a "non-default" way is a bit meh. The people using this target with a custom SOURCES_PATH, which I'd assume is not many at all...

This PR is not about adding a new feature for a few developers, but about fixing a bug in the existing feature. If consider to accept the point mentioned above, probably #22522 should be closed and the SOURCES_PATH variable should be removed from our depends and build system, no?

... could also just set QT_BASE_PATH.

QT_BASE_PATH=<some-path> make apk won't fix #22522.

I followed these steps from doc/build-android.md:

1. Download Android Studio
2. SDK Manager -> SDK Tools -> NDK
3. Use ANDROID_SDK=/home/test/Android/Sdk ANDROID_NDK=/home/test/Android/Sdk/ndk-bundle make HOST=aarch64-linux-android ANDROID_API_LEVEL=28 ANDROID_TOOLCHAIN_BIN=/home/test/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin
4. Run make && make apk in src/qt which gives same error as shared in build, android: make apk fails if depends source cache is in a non-default location #22522

@1440000bytes

3. Use ANDROID_SDK=/home/test/Android/Sdk ANDROID_NDK=/home/test/Android/Sdk/ndk-bundle make HOST=aarch64-linux-android ANDROID_API_LEVEL=28 ANDROID_TOOLCHAIN_BIN=/home/test/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin

I didn't check everything for now, but seeing "NDK (Side be side)" in your screenshot makes me believe that ANDROID_NDK=/home/test/Android/Sdk/ndk-bundle is wrong. It should be something like /home/test/Android/Sdk/ndk/23.1.7779620.

I changed it to ANDROID_NDK=/home/test/Android/Sdk/ndk/24.0.8215888/ but still same error

@1440000bytes

4. Run make && make apk in src/qt which gives same error as shared in #22522

It seems really strange for me, as in @achow101's issue "SOURCES_PATH is set to a non-default location", but you do not use the SOURCES_PATH variable at all.

Could you provide your commands and error messages exactly from your terminal please?

Guix builds

Could you provide your commands and error messages exactly from your terminal please?

https://pastebin.com/raw/kkduRKvs

@1440000bytes

Could you provide your commands and error messages exactly from your terminal please?

https://pastebin.com/raw/kkduRKvs

Thank you!

I think you did not build depends, and missed configuration step. It should be like that:

$ make -C depends HOST=aarch64-linux-android ANDROID_SDK=/home/hebasto/Android/Sdk ANDROID_NDK=/home/hebasto/Android/Sdk/ndk/23.1.7779620 ANDROID_API_LEVEL=28 ANDROID_TOOLCHAIN_BIN=/home/hebasto/Android/Sdk/ndk/23.1.7779620/toolchains/llvm/prebuilt/linux-x86_64/bin
$ ./autogen.sh
$ ./configure --quiet CONFIG_SITE=$PWD/depends/aarch64-linux-android/share/config.site --enable-suppress-external-warnings
$ make clean
$ cd src/qt
$ make
$ make apk

🐙 This pull request conflicts with the target branch and needs rebase.

_{Want to unsubscribe from rebase notifications on this pull request? Just convert this pull request to a "draft".}