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

Link libopus statically with libopusJNI

Browse Source 
We now build one .so file for the opus extension in the
internal build, so make the external build work the same way.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=184962896
This commit is contained in:
andrewlewis 2018-02-08 01:57:46 -08:00 committed by Oliver Woodman
parent 36bf0b2658
commit 542855b6eb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@
WORKING_DIR := $(call my-dir)
include $(CLEAR_VARS)
# build libopus.so
# build libopus.a
LOCAL_PATH := $(WORKING_DIR)
include libopus.mk
@ -29,5 +29,5 @@ LOCAL_ARM_MODE := arm
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := opus_jni.cc
LOCAL_LDLIBS := -llog -lz -lm
LOCAL_SHARED_LIBRARIES := libopus
LOCAL_STATIC_LIBRARIES := libopus
include $(BUILD_SHARED_LIBRARY)

2
extensions/opus/src/main/jni/libopus.mk
View File

@ -47,4 +47,4 @@ endif
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
include $(BUILD_SHARED_LIBRARY)
include $(BUILD_STATIC_LIBRARY)