Configure resource path to expected value (group + platform + variant)

gradle · Nov 27, 2021 · 92f458f · 92f458f
1 parent fb71a71
commit 92f458f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/buildSrc/src/main/java/gradlebuild/JniNokeePlugin.java b/buildSrc/src/main/java/gradlebuild/JniNokeePlugin.java
@@ -41,7 +41,7 @@ public void apply(Project project) {
         project.getPluginManager().apply(NativeToolChainRules.class);
 
         configureCppTasks(project);
-        configureMainLibrary(project.getExtensions().getByType(JavaNativeInterfaceLibrary.class));
+        configureMainLibrary(project);
         configureVariants(project);
         addComponentSourcesSetsToProjectSourceSet(project.getTasks(), project.getExtensions().getByType(JavaNativeInterfaceLibrary.class));
 
@@ -68,7 +68,8 @@ private static String toVariantName(TargetMachine targetMachine) {
         return targetMachine.getOperatingSystemFamily().getName() + "-" + targetMachine.getArchitecture().getName();
     }
 
-    private void configureMainLibrary(JavaNativeInterfaceLibrary library) {
+    private void configureMainLibrary(Project project) {
+        JavaNativeInterfaceLibrary library = project.getExtensions().getByType(JavaNativeInterfaceLibrary.class);
         library.getTargetMachines().set(supportedMachines(library.getMachines()));
         library.getTasks().configureEach(CppCompile.class, task -> {
             task.getCompilerArgs().addAll(task.getTargetPlatform().map(targetPlatform -> {
@@ -103,6 +104,12 @@ private void configureMainLibrary(JavaNativeInterfaceLibrary library) {
                 });
             }
         });
+        library.getVariants().configureEach(variant -> {
+            variant.getResourcePath().set(String.join("/",
+                project.getGroup().toString().replace('.', '/'),
+                "platform",
+                toVariantName(variant.getTargetMachine())));
+        });
     }
 
     private void addComponentSourcesSetsToProjectSourceSet(TaskContainer tasks, JavaNativeInterfaceLibrary library) {