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
google · Oct 18, 2018 · cc91449 · cc91449
1 parent ee02c67
commit cc91449
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -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
@@ -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