sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename libvpxJNI.so to libvpxV2JNI.so

Browse source 
Renamed to stop collision between the ExoV1 and ExoV2 implementation.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217348150
This commit is contained in:
cpaulino 2018-10-16 11:01:37 -07:00 committed by Oliver Woodman
parent ee02c6789a
commit cc914494d7
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java
View file

@ -27,7 +27,7 @@ public final class VpxLibrary {
ExoPlayerLibraryInfo.registerModule("goog.exo.vpx"); 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() {} private VpxLibrary() {}

4
extensions/vp9/src/main/jni/Android.mk
View file

@ -28,10 +28,10 @@ include $(LIBYUV_ROOT)/Android.mk
LOCAL_PATH := $(WORKING_DIR) LOCAL_PATH := $(WORKING_DIR)
include libvpx.mk include libvpx.mk
# build libvpxJNI.so # build libvpxV2JNI.so
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_PATH := $(WORKING_DIR) LOCAL_PATH := $(WORKING_DIR)
LOCAL_MODULE := libvpxJNI LOCAL_MODULE := libvpxV2JNI
LOCAL_ARM_MODE := arm LOCAL_ARM_MODE := arm
LOCAL_CPP_EXTENSION := .cc LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := vpx_jni.cc LOCAL_SRC_FILES := vpx_jni.cc