aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Koying Browet <cbro@semperpax.com>2017-12-22 11:00:00 +0100
committerRechi <Rechi@users.noreply.github.com>2017-12-22 11:00:00 +0100
commitd2ebc59772a77fcc14392788c653d3b35b3a68ad (patch)
tree4aa75ccb05d221cb19a8de77cffc4ce1e4d9103e
parentd3cc38d59b770db9179a0801c9ee5bb89c7c5171 (diff)
CHG: [droid] default toolchain = 16
-rw-r--r--docs/README.android6
-rw-r--r--tools/buildsteps/defaultenv2
-rw-r--r--tools/depends/README4
3 files changed, 6 insertions, 6 deletions
diff --git a/docs/README.android b/docs/README.android
index cb366ee4fb..326c9c8631 100644
--- a/docs/README.android
+++ b/docs/README.android
@@ -77,7 +77,7 @@ f. Once you have your hdd image with case sensitive hfs+ file system do all step
$ ./configure --with-tarballs=/Users/Shared/xbmc-depends/tarballs --host=arm-linux-androideabi \
--with-sdk-path=/Volumes/android-dev/android/android-sdk-macosx \
--with-sdk=android-21 \
- --with-ndk-path=/Volumes/android-dev/android/android-ndk-r14b \
+ --with-ndk-path=/Volumes/android-dev/android/android-ndk-r16 \
--with-toolchain=/Volumes/android-dev/android/android-toolchain-arm/android-21 \
--prefix=/Volumes/android-dev/android/xbmc-depends
@@ -90,7 +90,7 @@ download the latest version for your operating system. The NDK
can be downloaded from http://developer.android.com/tools/sdk/ndk/
[NOTICE] Compiling Kodi for Android requires Android NDK
- Revision 14b. For the SDK just use the latest available.
+ Revision 16. For the SDK just use the latest available.
It will work.
After downloading the SDK and NDK extract the files contained in the
@@ -98,7 +98,7 @@ archives to your harddisk. For our example we are extracting in the following
directories (this matches the example from tools/depends/README as well):
NDK (referenced as <android-ndk> from now on):
-/opt/android-ndk-r14b
+/opt/android-ndk-r16
TOOLCHAIN (arm) (referenced as <android-toolchain-arm> from now on):
/opt/arm-linux-androideabi-4.9-vanilla/android-21
diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv
index 43b31ad2b5..412f12a3fd 100644
--- a/tools/buildsteps/defaultenv
+++ b/tools/buildsteps/defaultenv
@@ -35,7 +35,7 @@ case $XBMC_PLATFORM_DIR in
android)
DEFAULT_SDK_VERSION="24"
- DEFAULT_NDK_VERSION="14b"
+ DEFAULT_NDK_VERSION="16"
DEFAULT_NDK_API="21"
DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends
DEFAULT_CONFIGURATION="Debug"
diff --git a/tools/depends/README b/tools/depends/README
index 5735763bef..42f08fe45e 100644
--- a/tools/depends/README
+++ b/tools/depends/README
@@ -25,10 +25,10 @@ TVOS:
#----------------------------------------------------------------------------
arm:
- ./configure --with-tarballs=/opt/xbmc-tarballs --host=arm-linux-androideabi --with-sdk-path=/opt/android-sdk-linux --with-ndk-path=/opt/android-ndk-r10d --with-toolchain=/opt/arm-linux-androideabi-4.8-vanilla/android-17 --prefix=/opt/xbmc-depends
+ ./configure --with-tarballs=/opt/xbmc-tarballs --host=arm-linux-androideabi --with-sdk-path=/opt/android-sdk-linux --with-ndk-path=/opt/android-ndk-r16 --with-toolchain=/opt/arm-linux-androideabi-4.8-vanilla/android-21 --prefix=/opt/xbmc-depends
x86:
- ./configure --with-tarballs=/opt/xbmc-tarballs --host=i686-linux-android --with-sdk-path=/opt/android-sdk-linux --with-ndk-path=/opt/android-ndk-r10d --with-toolchain=/opt/x86-linux-4.8-vanilla/android-17 --prefix=/opt/xbmc-depends
+ ./configure --with-tarballs=/opt/xbmc-tarballs --host=i686-linux-android --with-sdk-path=/opt/android-sdk-linux --with-ndk-path=/opt/android-ndk-r16 --with-toolchain=/opt/x86-linux-4.8-vanilla/android-21 --prefix=/opt/xbmc-depends
#- Linux
#----------------------------------------------------------------------------