From f432b52111710fed647762b0efd9d471d3bab1a1 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 8 Feb 2018 01:57:46 -0800
Subject: [PATCH] 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
---
 extensions/opus/src/main/jni/Android.mk | 4 ++--
 extensions/opus/src/main/jni/libopus.mk | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/opus/src/main/jni/Android.mk b/extensions/opus/src/main/jni/Android.mk
index 2ceb8fc4f70..9d1e4fe726f 100644
--- 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
index 0a5dd15b5af..672df600c01 100644
--- 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)