From e8b0d489eb8c67a5846142d34f1b54a3984f2b67 Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 1 Apr 2019 19:05:13 +0100 Subject: [PATCH] Rename Lib Opus in ExoV2 to avoid the namespace collision between ExoV1 and ExoV2's version of libopusJNI.so PiperOrigin-RevId: 241359424 --- .../com/google/android/exoplayer2/ext/opus/OpusLibrary.java | 2 +- extensions/opus/src/main/jni/Android.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java index 4cb3ce3190..285be96388 100644 --- a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java +++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java @@ -27,7 +27,7 @@ public final class OpusLibrary { ExoPlayerLibraryInfo.registerModule("goog.exo.opus"); } - private static final LibraryLoader LOADER = new LibraryLoader("opusJNI"); + private static final LibraryLoader LOADER = new LibraryLoader("opusV2JNI"); private OpusLibrary() {} diff --git a/extensions/opus/src/main/jni/Android.mk b/extensions/opus/src/main/jni/Android.mk index 9d1e4fe726..0b06d9ecd8 100644 --- a/extensions/opus/src/main/jni/Android.mk +++ b/extensions/opus/src/main/jni/Android.mk @@ -21,10 +21,10 @@ include $(CLEAR_VARS) LOCAL_PATH := $(WORKING_DIR) include libopus.mk -# build libopusJNI.so +# build libopusV2JNI.so include $(CLEAR_VARS) LOCAL_PATH := $(WORKING_DIR) -LOCAL_MODULE := libopusJNI +LOCAL_MODULE := libopusV2JNI LOCAL_ARM_MODE := arm LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := opus_jni.cc