Merge pull request #173 from defold/issue-5190-exclude-dynamic-libs

Issue 5190: Added support for "excludeDynamicLibs" in manifest
defold · Sep 10, 2020 · 0d10b46 · 0d10b46
2 parents 908b587 + a5b9203
commit 0d10b46
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/server/src/main/java/com/defold/extender/Extender.java b/server/src/main/java/com/defold/extender/Extender.java
@@ -539,7 +539,7 @@ public Void call() throws Exception {
         List<Future<Void>> futures = executor.invokeAll(callables);
         try {
             for (Future<Void> future : futures) {
-                future.get(); 
+                future.get();
             }
         } catch (ExecutionException e) {
             if (e.getCause() instanceof IOException) {
@@ -662,6 +662,7 @@ private List<File> linkEngine(List<String> symbols, Map<String, Object> manifest
         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") ));
+        context.put("dynamicLibs", ExtenderUtil.pruneItems(ExtenderUtil.getStringList(context, "dynamicLibs"), ExtenderUtil.getStringList(mainContext, "includeDynamicLibs"), ExtenderUtil.getStringList(mainContext, "excludeDynamicLibs")) );
 
         // 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
@@ -102,11 +102,13 @@ void validate(String extensionName, File extensionFolder, Map<String, Object> co
                 case "excludeJars":
                 case "excludeJsLibs":
                 case "excludeSymbols":
-                case "use-clang": // deprecated
-                case "aaptExtraPackages":
                 case "excludeObjectFiles":
                 case "includeObjectFiles":
+                case "excludeDynamicLibs":
+                case "excludeFrameworks":
+                case "aaptExtraPackages":
                 case "objectFiles":
+                case "use-clang": // deprecated
                     continue; // no need to whitelist
 
                 default: