diff options
| author | fuzzard <fuzzard@kodi.tv> | 2021-06-25 13:16:10 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2021-06-25 16:17:37 +1000 |
| commit | 0b333a92253ba5c8fb0cacd103d0c61c82ab3d83 (patch) | |
| tree | deabae29a603d8e3d730aa213cfb66aa7f5bcce3 /tools/buildsteps | |
| parent | 592fdeef613d44e0f8a8d6375a900435d34ded3b (diff) | |
[jenkins][android] bump NDK r21e
bump jenkins to use r21e
neon is enabled by default in r21
Diffstat (limited to 'tools/buildsteps')
| -rw-r--r-- | tools/buildsteps/android-arm64-v8a/configure-depends | 2 | ||||
| -rw-r--r-- | tools/buildsteps/android/configure-depends | 2 | ||||
| -rw-r--r-- | tools/buildsteps/defaultenv | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/buildsteps/android-arm64-v8a/configure-depends b/tools/buildsteps/android-arm64-v8a/configure-depends index 1ab3709b71..cec12b7e34 100644 --- a/tools/buildsteps/android-arm64-v8a/configure-depends +++ b/tools/buildsteps/android-arm64-v8a/configure-depends @@ -14,5 +14,5 @@ then --with-ndk-path=$NDK_PATH \ $(if [ "$NDK_API" != "Default" ]; then echo --with-ndk-api=$NDK_API;fi) \ --prefix=$XBMC_DEPENDS_ROOT \ - --enable-neon $DEBUG_SWITCH + $DEBUG_SWITCH fi diff --git a/tools/buildsteps/android/configure-depends b/tools/buildsteps/android/configure-depends index c6f4c695b1..649ff6dc1f 100644 --- a/tools/buildsteps/android/configure-depends +++ b/tools/buildsteps/android/configure-depends @@ -14,5 +14,5 @@ then --with-ndk-path=$NDK_PATH \ $(if [ "$NDK_API" != "Default" ]; then echo --with-ndk-api=$NDK_API;fi) \ --prefix=$XBMC_DEPENDS_ROOT \ - --enable-neon $DEBUG_SWITCH + $DEBUG_SWITCH fi diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv index 243077d0ae..b9c04301dd 100644 --- a/tools/buildsteps/defaultenv +++ b/tools/buildsteps/defaultenv @@ -41,7 +41,7 @@ case $XBMC_PLATFORM_DIR in ;; android) - DEFAULT_NDK_VERSION="20" # NDK package version (newer API can be inside) + DEFAULT_NDK_VERSION="21e" # NDK package version (newer API can be inside) DEFAULT_NDK_API="21" # Lollipop API level (21) defined in package ./sysroot/usr/include/android/api-level.h DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" |