dont use nativecodegen config for generation

libgdx · Jul 10, 2024 · 0345376 · 0345376
1 parent 78d92ee
commit 0345376
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/gdx-jnigen-gradle/src/main/java/com/badlogic/gdx/jnigen/gradle/JnigenExtension.java b/gdx-jnigen-gradle/src/main/java/com/badlogic/gdx/jnigen/gradle/JnigenExtension.java
@@ -79,7 +79,7 @@ public class JnigenExtension {
     public JnigenExtension (Project project) {
         this.project = project;
         this.subProjectDir = project.getProjectDir().getAbsolutePath() + File.separator;
-        this.nativeCodeGeneratorConfig = new NativeCodeGeneratorConfig(project, jniDir);
+        this.nativeCodeGeneratorConfig = new NativeCodeGeneratorConfig(project);
     }
 
     public void nativeCodeGenerator (Action<NativeCodeGeneratorConfig> container) {
@@ -268,15 +268,13 @@ public void each (Predicate<BuildTarget> condition, Action<BuildTarget> containe
     class NativeCodeGeneratorConfig {
         SourceSet sourceSet;
         private String[] sourceDirs;
-        String jniDir = "jni";
         String[] includes = null;
         String[] excludes = null;
 
-        public NativeCodeGeneratorConfig (Project project, String jniDir) {
+        public NativeCodeGeneratorConfig (Project project) {
             JavaPluginConvention javaPlugin = project.getConvention().getPlugin(JavaPluginConvention.class);
             SourceSetContainer sourceSets = javaPlugin.getSourceSets();
             sourceSet = sourceSets.findByName("main");
-            this.jniDir = jniDir;
         }
 
         @Override

diff --git a/gdx-jnigen-gradle/src/main/java/com/badlogic/gdx/jnigen/gradle/JnigenTask.java b/gdx-jnigen-gradle/src/main/java/com/badlogic/gdx/jnigen/gradle/JnigenTask.java
@@ -50,7 +50,7 @@ public void run () {
                 .forEach(s -> {
                     try {
                         new NativeCodeGenerator().generate(s,
-                                ext.nativeCodeGeneratorConfig.sourceSet.getRuntimeClasspath().getAsPath(), ext.subProjectDir + ext.nativeCodeGeneratorConfig.jniDir,
+                                ext.nativeCodeGeneratorConfig.sourceSet.getRuntimeClasspath().getAsPath(), ext.subProjectDir + ext.jniDir,
                                 ext.nativeCodeGeneratorConfig.includes, ext.nativeCodeGeneratorConfig.excludes);
                     } catch (Exception e) {
                         throw new RuntimeException("NativeCodeGenerator threw exception", e);