diff options
| author | fuzzard <fuzzard@kodi.tv> | 2024-07-21 07:48:28 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2024-07-21 07:48:28 +1000 |
| commit | 70d760bd1e02dfd9df9bdb547c1bfca61bbae822 (patch) | |
| tree | 3a171f69f497bc04c3697fde2a3f92f90c1c4fef /tools | |
| parent | edf6da24919595fa49dc419d93c78a90bf16c0f9 (diff) | |
[buildsteps] android update to jenkins docker info
Buildsteps are still used for addon CI jobs. we need this data to match the
pipeline CI (and therefore the actual docker path structure) to succed
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/buildsteps/android-arm64-v8a/configure-depends | 2 | ||||
| -rw-r--r-- | tools/buildsteps/android-x86_64/configure-depends | 2 | ||||
| -rw-r--r-- | tools/buildsteps/android/configure-depends | 2 | ||||
| -rw-r--r-- | tools/buildsteps/androidx86/configure-depends | 2 | ||||
| -rw-r--r-- | tools/buildsteps/defaultenv | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tools/buildsteps/android-arm64-v8a/configure-depends b/tools/buildsteps/android-arm64-v8a/configure-depends index cec12b7e34..ba84154a30 100644 --- a/tools/buildsteps/android-arm64-v8a/configure-depends +++ b/tools/buildsteps/android-arm64-v8a/configure-depends @@ -3,7 +3,7 @@ XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv #the following path must exist on the slave and use the defined scheme here! -NDK_PATH=$ANDROID_DEV_ROOT/android-ndk-r$NDK_VERSION +NDK_PATH=$SDK_PATH/ndk/$NDK_VERSION if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then diff --git a/tools/buildsteps/android-x86_64/configure-depends b/tools/buildsteps/android-x86_64/configure-depends index c27d6d8723..2904210955 100644 --- a/tools/buildsteps/android-x86_64/configure-depends +++ b/tools/buildsteps/android-x86_64/configure-depends @@ -3,7 +3,7 @@ XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv #the following path must exist on the slave and use the defined scheme here! -NDK_PATH=$ANDROID_DEV_ROOT/android-ndk-r$NDK_VERSION +NDK_PATH=$SDK_PATH/ndk/$NDK_VERSION if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then diff --git a/tools/buildsteps/android/configure-depends b/tools/buildsteps/android/configure-depends index 649ff6dc1f..c31f9638d3 100644 --- a/tools/buildsteps/android/configure-depends +++ b/tools/buildsteps/android/configure-depends @@ -3,7 +3,7 @@ XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv #the following path must exist on the slave and use the defined scheme here! -NDK_PATH=$ANDROID_DEV_ROOT/android-ndk-r$NDK_VERSION +NDK_PATH=$SDK_PATH/ndk/$NDK_VERSION if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then diff --git a/tools/buildsteps/androidx86/configure-depends b/tools/buildsteps/androidx86/configure-depends index 9fb0e203f8..a6b88b3634 100644 --- a/tools/buildsteps/androidx86/configure-depends +++ b/tools/buildsteps/androidx86/configure-depends @@ -3,7 +3,7 @@ XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv #the following path must exist on the slave and use the defined scheme here! -NDK_PATH=$ANDROID_DEV_ROOT/android-ndk-r$NDK_VERSION +NDK_PATH=$SDK_PATH/ndk/$NDK_VERSION if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv index 8bc7bb04b7..faa33802c4 100644 --- a/tools/buildsteps/defaultenv +++ b/tools/buildsteps/defaultenv @@ -56,7 +56,7 @@ case $XBMC_PLATFORM_DIR in ;; android) - DEFAULT_NDK_VERSION="26c" # NDK package version (newer API can be inside) + DEFAULT_NDK_VERSION="26.2.11394342" # NDK package version (newer API can be inside) DEFAULT_NDK_API="24" # Nougat API level (24) defined in package ./sysroot/usr/include/android/api-level.h DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="RelWithDebInfo" |