loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3667 from alexcohn/ndk-r16-support

Browse Source 
minimal fix to support NDK r16
This commit is contained in:
ojw28 2018-01-15 13:47:05 +00:00 committed by GitHub
commit 96b7daa93a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/vp9/README.md
View File

@ -29,8 +29,6 @@ VP9_EXT_PATH="${EXOPLAYER_ROOT}/extensions/vp9/src/main"
```
* Download the [Android NDK][] and set its location in an environment variable.
Only versions up to NDK 15c are supported currently (see [#3520][]).
```
NDK_PATH="<path to Android NDK>"
```

2
extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh
View File

@ -102,7 +102,7 @@ for i in $(seq 0 ${limit}); do
# configure and make
echo "build_android_configs: "
echo "configure ${config[${i}]} ${common_params}"
../../libvpx/configure ${config[${i}]} ${common_params}
../../libvpx/configure ${config[${i}]} ${common_params} --extra-cflags="-isystem $ndk/sysroot/usr/include/arm-linux-androideabi -isystem $ndk/sysroot/usr/include"
rm -f libvpx_srcs.txt
for f in ${allowed_files}; do
# the build system supports multiple different configurations. avoid