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

minimal fix to support NDK r16

extensions/vp9/README.md

@@ -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.
 * 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>"
 NDK_PATH="<path to Android NDK>"
 ```
 ```

extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh

@@ -102,7 +102,7 @@ for i in $(seq 0 ${limit}); do
   # configure and make
   # configure and make
   echo "build_android_configs: "
   echo "build_android_configs: "
   echo "configure ${config[${i}]} ${common_params}"
   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
   rm -f libvpx_srcs.txt
   for f in ${allowed_files}; do
   for f in ${allowed_files}; do
     # the build system supports multiple different configurations. avoid
     # the build system supports multiple different configurations. avoid