Added support for explicit object files in the linking stage

defold · May 11, 2020 · a6db4e7 · a6db4e7
1 parent 5c0fea1
commit a6db4e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/server/src/main/java/com/defold/extender/Extender.java b/server/src/main/java/com/defold/extender/Extender.java
@@ -621,6 +621,7 @@ private List<File> linkEngine(List<String> symbols, Map<String, Object> manifest
         context.put("ext", env);
         context.put("engineLibs", ExtenderUtil.pruneItems(ExtenderUtil.getStringList(context, "engineLibs"), ExtenderUtil.getStringList(mainContext, "includeLibs"), ExtenderUtil.getStringList(mainContext, "excludeLibs")) );
         context.put("engineJsLibs", ExtenderUtil.pruneItems(ExtenderUtil.getStringList(context, "engineJsLibs"), ExtenderUtil.getStringList(mainContext, "includeJsLibs"), ExtenderUtil.getStringList(mainContext, "excludeJsLibs")) );
+        context.put("objectFiles", ExtenderUtil.pruneItems(ExtenderUtil.getStringList(mainContext, "objectFiles"), ExtenderUtil.getStringList(mainContext, "includeObjectFiles"), ExtenderUtil.getStringList(mainContext, "excludeObjectFiles") ));
 
         // WINE->clang transition pt1: in the transition period from link.exe -> lld, we want to make sure we can write "foo" as opposed to "foo.lib"
         context.put("libs", patchLibs((List<String>) context.get("libs")));

diff --git a/server/src/main/java/com/defold/extender/ExtensionManifestValidator.java b/server/src/main/java/com/defold/extender/ExtensionManifestValidator.java
@@ -70,6 +70,9 @@ void validate(String extensionName, Map<String, Object> context) throws Extender
                 case "excludeSymbols":
                 case "use-clang": // deprecated
                 case "aaptExtraPackages":
+                case "excludeObjectFiles":
+                case "includeObjectFiles":
+                case "objectFiles":
                     continue; // no need to whitelist
 
                 default: