libraries support, addresses #71

libgdx · Jul 14, 2024 · a810b50 · a810b50
1 parent 1165bd9
commit a810b50
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/gdx-jnigen/src/main/java/com/badlogic/gdx/jnigen/build/toolchains/AndroidToolchain.java b/gdx-jnigen/src/main/java/com/badlogic/gdx/jnigen/build/toolchains/AndroidToolchain.java
@@ -94,6 +94,7 @@ public void compile () {
         template = template.replace("%cFlags%", target.cFlags);
         template = template.replace("%cppFlags%", target.cppFlags);
         template = template.replace("%linkerFlags%", target.linkerFlags);
+        template = template.replace("%libraries%", target.libraries);
         template = template.replace("%srcFiles%", srcFiles);
         for (String extra : target.androidAndroidMk)
             template += "\n" + extra;

diff --git a/gdx-jnigen/src/main/resources/com/badlogic/gdx/jnigen/resources/scripts/Android.mk.template b/gdx-jnigen/src/main/resources/com/badlogic/gdx/jnigen/resources/scripts/Android.mk.template
@@ -6,7 +6,8 @@ LOCAL_C_INCLUDES := %headerDirs%
 
 LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%) %cFlags%
 LOCAL_CPPFLAGS := $(LOCAL_C_INCLUDES:%=-I%) %cppFlags%
-LOCAL_LDLIBS := %linkerFlags%
+LOCAL_LDFLAGS := %linkerFlags%
+LOCAL_LDLIBS := %libraries%
 LOCAL_ARM_MODE  := arm
 
 LOCAL_SRC_FILES := %srcFiles%