Skip to content

Commit

Permalink
Always use the recommended Android NDK version
Browse files Browse the repository at this point in the history
The android_ndk_root argument is now without the version
  • Loading branch information
martinburchell committed Nov 10, 2023
1 parent 4273c58 commit cfbe053
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions tablet_qt/tools/build_qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -501,9 +501,12 @@
DEFAULT_ROOT_DIR = join(USER_DIR, "dev", "qt_local_build")

DEFAULT_ANDROID_SDK = join(USER_DIR, "dev", "android-sdk-linux")
DEFAULT_ANDROID_NDK = join(
USER_DIR, "dev", "android-ndk-r20"
) # from 2019-06-15, inc. 64-bit ARM # noqa

DEFAULT_ANDROID_NDK = join(USER_DIR, "dev", "android-ndk-linux")


# https://doc.qt.io/qt-6.5/android-getting-started.html
ANDROID_NDK_VERSION = "25.1.8937393"

DEFAULT_JAVA_HOME = "/usr/lib/jvm/java-11-openjdk-amd64"

Expand Down Expand Up @@ -1628,7 +1631,9 @@ def __init__(self, args: argparse.Namespace) -> None:
# - used for cross-compilation to Android targets
self.android_sdk_version = ANDROID_SDK_VERSION
self.android_sdk_root = args.android_sdk_root # type: str
self.android_ndk_root = args.android_ndk_root # type: str
self.android_ndk_root = join(
args.android_ndk_root, ANDROID_NDK_VERSION
) # type: str
self.android_ndk_host = args.android_ndk_host # type: str
self.android_toolchain_version = (
args.android_toolchain_version
Expand Down

0 comments on commit cfbe053

Please sign in to comment.