Merge pull request #43271 from Dilhasha/resource-config-change

Update resource config json for resources
ballerina-platform · Aug 12, 2024 · b16de4f · b16de4f
2 parents 373ceb0 + b06c27a
commit b16de4f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/.../resources/META-INF/native-image/org.ballerinalang/ballerina-runtime/resource-config.json b/.../resources/META-INF/native-image/org.ballerinalang/ballerina-runtime/resource-config.json
@@ -3,6 +3,9 @@
         "includes": [
             {
                 "pattern": "\\QMETA-INF/axiom.xml\\E"
+            },
+            {
+                "pattern": "resources/.*"
             }
         ]
     },

diff --git a/cli/ballerina-cli/src/main/java/io/ballerina/cli/task/RunNativeImageTestTask.java b/cli/ballerina-cli/src/main/java/io/ballerina/cli/task/RunNativeImageTestTask.java
@@ -65,7 +65,6 @@
 import static io.ballerina.cli.utils.TestUtils.generateTesterinaReports;
 import static io.ballerina.projects.util.ProjectConstants.BIN_DIR_NAME;
 import static io.ballerina.projects.util.ProjectConstants.TESTS_CACHE_DIR_NAME;
-import static io.ballerina.projects.util.ProjectUtils.getResourcesPath;
 import static org.ballerinalang.test.runtime.util.TesterinaConstants.CACHE_DIR;
 import static org.ballerinalang.test.runtime.util.TesterinaConstants.DOT;
 import static org.ballerinalang.test.runtime.util.TesterinaConstants.TESTERINA_TEST_SUITE;
@@ -370,9 +369,6 @@ private int runTestSuiteWithNativeImage(Package currentPackage, Target target,
         nativeArgs.add("-H:Path=" + NativeUtils.convertWinPathToUnixFormat(NativeUtils
                 .addQuotationMarkToString(nativeTargetPath.toString())));
 
-        // Add resources
-        nativeArgs.add("-H:IncludeResources=" + getResourcesPath());
-
         // native-image configs
         nativeArgs.add("-H:ReflectionConfigurationFiles=" + NativeUtils
                 .convertWinPathToUnixFormat(NativeUtils.addQuotationMarkToString(

diff --git a/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JBallerinaBackend.java b/compiler/ballerina-lang/src/main/java/io/ballerina/projects/JBallerinaBackend.java
@@ -79,7 +79,6 @@
 import static io.ballerina.projects.util.ProjectConstants.DOT;
 import static io.ballerina.projects.util.ProjectConstants.RESOURCE_DIR_NAME;
 import static io.ballerina.projects.util.ProjectUtils.getConflictingResourcesMsg;
-import static io.ballerina.projects.util.ProjectUtils.getResourcesPath;
 import static io.ballerina.projects.util.ProjectUtils.getThinJarFileName;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.CLASS_FILE_SUFFIX;
 
@@ -724,7 +723,6 @@ private Path emitGraalExecutable(Path executableFilePath, List<Diagnostic> emitR
                     executableFilePath.toString(),
                     "-H:Name=" + nativeImageName,
                     "-H:Path=" + executableFilePath.getParent(),
-                    "-H:IncludeResources=" + getResourcesPath(),
                     "--no-fallback"));
         }