From e4adf99ac0b47b5bd19ab4c70ab330222ab35966 Mon Sep 17 00:00:00 2001 From: aquilescanta Date: Fri, 27 Nov 2020 14:28:41 +0000 Subject: [PATCH] Use symlinking for dependency on libvpx As opposed to in-source git-clone. PiperOrigin-RevId: 344525899 --- extensions/vp9/README.md | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md index 765cdbca3b..c831e61a79 100644 --- a/extensions/vp9/README.md +++ b/extensions/vp9/README.md @@ -35,25 +35,23 @@ VP9_EXT_PATH="${EXOPLAYER_ROOT}/extensions/vp9/src/main" NDK_PATH="" ``` -* Fetch libvpx: - -``` -cd "${VP9_EXT_PATH}/jni" && \ -git clone https://chromium.googlesource.com/webm/libvpx libvpx -``` - -* Checkout an appropriate branch of libvpx. We cannot guarantee compatibility +* Fetch an appropriate branch of libvpx. We cannot guarantee compatibility with all versions of libvpx. We currently recommend version 1.8.0: ``` -cd "${VP9_EXT_PATH}/jni/libvpx" && \ -git checkout tags/v1.8.0 -b v1.8.0 +cd "" && \ +git clone https://chromium.googlesource.com/webm/libvpx && \ +cd libvpx && \ +git checkout tags/v1.8.0 -b v1.8.0 && \ +LIBVPX_PATH="$(pwd)" ``` -* Run a script that generates necessary configuration files for libvpx: +* Add a link to the libvpx source code in the vp9 extension `jni` directory and + run a script that generates necessary configuration files for libvpx: ``` cd ${VP9_EXT_PATH}/jni && \ +ln -s "$LIBVPX_PATH" libvpx && \ ./generate_libvpx_android_configs.sh ``` @@ -80,8 +78,8 @@ should be possible to follow the Linux instructions in [Windows PowerShell][]. * Android config scripts should be re-generated by running `generate_libvpx_android_configs.sh` * Clean and re-build the project. -* If you want to use your own version of libvpx, place it in - `${VP9_EXT_PATH}/jni/libvpx`. Please note that +* If you want to use your own version of libvpx, refer to it using the a symlink + in `${VP9_EXT_PATH}/jni/libvpx`. Please note that `generate_libvpx_android_configs.sh` and the makefiles may need to be modified to work with arbitrary versions of libvpx.