MMAPI: build Sonivox module as static library (to avoid conflicts wit…

…h built-in version)
woesss · Sep 10, 2023 · fb1dab2 · fb1dab2
1 parent 127aab3
commit fb1dab2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/src/main/cpp/mmapi_eas/Android.mk b/app/src/main/cpp/mmapi_eas/Android.mk
@@ -17,7 +17,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
 
 LOCAL_ARM_MODE := arm
 
-LOCAL_SHARED_LIBRARIES := sonivox mmapi_common
+LOCAL_SHARED_LIBRARIES := mmapi_common
+
+LOCAL_STATIC_LIBRARIES := sonivox
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
     LOCAL_ARM_NEON := false

diff --git a/app/src/main/cpp/sonivox/Android.mk b/app/src/main/cpp/sonivox/Android.mk
@@ -132,4 +132,4 @@ endif
 LOCAL_EXPORT_C_INCLUDES  :=	$(LOCAL_PATH)/include
 LOCAL_EXPORT_CFLAGS := $(LOCAL_CFLAGS)
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/app/src/main/java/ru/woesss/j2me/mmapi/sonivox/EAS.java b/app/src/main/java/ru/woesss/j2me/mmapi/sonivox/EAS.java
@@ -42,7 +42,6 @@ class EAS {
 		System.loadLibrary("c++_shared");
 		System.loadLibrary("oboe");
 		System.loadLibrary("mmapi_common");
-		System.loadLibrary("sonivox");
 		System.loadLibrary("mmapi_eas");
 	}
 }