loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename Lib Opus in ExoV2 to avoid the namespace collision between ExoV1 and ExoV2's version of libopusJNI.so

Browse Source 
PiperOrigin-RevId: 241359424
This commit is contained in:
olly 2019-04-01 19:05:13 +01:00 committed by Oliver Woodman
parent e612511afc
commit e8b0d489eb
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/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java
View File

@ -27,7 +27,7 @@ public final class OpusLibrary {
ExoPlayerLibraryInfo.registerModule("goog.exo.opus"); ExoPlayerLibraryInfo.registerModule("goog.exo.opus");
} }
private static final LibraryLoader LOADER = new LibraryLoader("opusJNI"); private static final LibraryLoader LOADER = new LibraryLoader("opusV2JNI");
private OpusLibrary() {} private OpusLibrary() {}

4
extensions/opus/src/main/jni/Android.mk
View File

@ -21,10 +21,10 @@ include $(CLEAR_VARS)
LOCAL_PATH := $(WORKING_DIR) LOCAL_PATH := $(WORKING_DIR)
include libopus.mk include libopus.mk
# build libopusJNI.so # build libopusV2JNI.so
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_PATH := $(WORKING_DIR) LOCAL_PATH := $(WORKING_DIR)
LOCAL_MODULE := libopusJNI LOCAL_MODULE := libopusV2JNI
LOCAL_ARM_MODE := arm LOCAL_ARM_MODE := arm
LOCAL_CPP_EXTENSION := .cc LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := opus_jni.cc LOCAL_SRC_FILES := opus_jni.cc