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
google · Feb 8, 2018 · f432b52 · f432b52
1 parent 0384ff0
commit f432b52
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/extensions/opus/src/main/jni/Android.mk b/extensions/opus/src/main/jni/Android.mk
@@ -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)
diff --git a/extensions/opus/src/main/jni/libopus.mk b/extensions/opus/src/main/jni/libopus.mk
@@ -47,4 +47,4 @@ endif
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)