From cc914494d7d8ef51ba305dc7e0baa04fa130b9d4 Mon Sep 17 00:00:00 2001 From: cpaulino Date: Tue, 16 Oct 2018 11:01:37 -0700 Subject: [PATCH] Rename libvpxJNI.so to libvpxV2JNI.so Renamed to stop collision between the ExoV1 and ExoV2 implementation. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=217348150 --- .../com/google/android/exoplayer2/ext/vp9/VpxLibrary.java | 2 +- extensions/vp9/src/main/jni/Android.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java index 854576b4b2..5a65fc56ff 100644 --- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java +++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java @@ -27,7 +27,7 @@ public final class VpxLibrary { ExoPlayerLibraryInfo.registerModule("goog.exo.vpx"); } - private static final LibraryLoader LOADER = new LibraryLoader("vpx", "vpxJNI"); + private static final LibraryLoader LOADER = new LibraryLoader("vpx", "vpxV2JNI"); private VpxLibrary() {} diff --git a/extensions/vp9/src/main/jni/Android.mk b/extensions/vp9/src/main/jni/Android.mk index 868b869d56..fdcdc57b41 100644 --- a/extensions/vp9/src/main/jni/Android.mk +++ b/extensions/vp9/src/main/jni/Android.mk @@ -28,10 +28,10 @@ include $(LIBYUV_ROOT)/Android.mk LOCAL_PATH := $(WORKING_DIR) include libvpx.mk -# build libvpxJNI.so +# build libvpxV2JNI.so include $(CLEAR_VARS) LOCAL_PATH := $(WORKING_DIR) -LOCAL_MODULE := libvpxJNI +LOCAL_MODULE := libvpxV2JNI LOCAL_ARM_MODE := arm LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := vpx_jni.cc