Skip to content

Commit 9e575de

Browse files
committed
Update test case
1 parent 298db7c commit 9e575de

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

server/src/main/java/com/defold/extender/ExtenderUtil.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,10 @@ private static class PruneMapping {
567567
new PruneMapping("objectFiles", "includeObjectFiles", "excludeObjectFiles"),
568568
new PruneMapping("dynamicLibs", "includeDynamicLibs", "excludeDynamicLibs"),
569569
new PruneMapping("symbols", "includeSymbols", "excludeSymbols"),
570-
new PruneMapping("jars", "includeJars", "excludeJars"),
570+
// if applied manifest contains 'symbols' which were excluded before - need update 'excludeSymbols' list
571+
// because depends on that list we defined which extension to build and which symbols should be included into
572+
// result binary
573+
new PruneMapping("excludeSymbols", "", "symbols"),
571574
new PruneMapping("frameworks", "includeFrameworks", "excludeFrameworks")
572575
);
573576

server/src/test/java/com/defold/extender/ExtenderUtilTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ public void testMergeManifests() throws IOException, ExtenderException {
331331
res = ExtenderUtil.mergeContexts(res, appManifest.platforms.get("linux").context);
332332
List<String> libs = (List<String>)res.get("libs");
333333
List<String> symbols = (List<String>)res.get("symbols");
334+
List<String> excludeSymbols = (List<String>)res.get("excludeSymbols");
334335
assertTrue(libs.contains("profile"));
335336
assertTrue(libs.contains("profilerext"));
336337
assertTrue(libs.contains("profiler_remotery"));
@@ -342,5 +343,9 @@ public void testMergeManifests() throws IOException, ExtenderException {
342343
assertTrue(symbols.contains("ProfilerExt"));
343344
assertTrue(symbols.contains("ProfilerBasic"));
344345
assertTrue(symbols.contains("ProfilerRemotery"));
346+
347+
assertFalse(excludeSymbols.contains("ProfilerExt"));
348+
assertFalse(excludeSymbols.contains("ProfilerBasic"));
349+
assertFalse(excludeSymbols.contains("ProfilerRemotery"));
345350
}
346351
}

0 commit comments

Comments
 (0)