Commit 542855b6 by andrewlewis Committed by Oliver Woodman

Link libopus statically with libopusJNI

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
parent 36bf0b26
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
WORKING_DIR := $(call my-dir) WORKING_DIR := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
# build libopus.so # build libopus.a
LOCAL_PATH := $(WORKING_DIR) LOCAL_PATH := $(WORKING_DIR)
include libopus.mk include libopus.mk
...@@ -29,5 +29,5 @@ LOCAL_ARM_MODE := arm ...@@ -29,5 +29,5 @@ LOCAL_ARM_MODE := arm
LOCAL_CPP_EXTENSION := .cc LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := opus_jni.cc LOCAL_SRC_FILES := opus_jni.cc
LOCAL_LDLIBS := -llog -lz -lm LOCAL_LDLIBS := -llog -lz -lm
LOCAL_SHARED_LIBRARIES := libopus LOCAL_STATIC_LIBRARIES := libopus
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
...@@ -47,4 +47,4 @@ endif ...@@ -47,4 +47,4 @@ endif
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
include $(BUILD_SHARED_LIBRARY) include $(BUILD_STATIC_LIBRARY)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment