From 2cc044ded10f548b5e7dd89922cd3a494f7898aa Mon Sep 17 00:00:00 2001
From: Alex Cohn <sasha.cohn@gmail.com>
Date: Thu, 4 Jan 2018 13:22:13 +0200
Subject: [PATCH] minimal fix to support NDK r16

---
 extensions/vp9/README.md                                       | 2 --
 extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md
index 649e4a6ee2..8dc4974430 100644
--- a/extensions/vp9/README.md
+++ b/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.
-Only versions up to NDK 15c are supported currently (see [#3520][]).
-
 ```
 NDK_PATH="<path to Android NDK>"
 ```
diff --git a/extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh b/extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh
index 5f058d0551..4aabf2379e 100755
--- a/extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh
+++ b/extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh
@@ -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