Skip to content

Commit

Permalink
force include static libs from xcFrameworks
Browse files Browse the repository at this point in the history
  • Loading branch information
dasisdormax committed Jul 29, 2023
1 parent 38442d7 commit cd0c98f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ private void processXCFramework(File xcFrameworkLocation, List<File> destLocatio
} else if (libPath.endsWith(".a")) {
// static library inside .xcframework, add it to libs
File staticLibFile = new File(new File(xcFrameworkLocation, library.getIdentifier()), libPath);
destLibs.add(new Config.Lib(staticLibFile.getAbsolutePath(), false));
destLibs.add(new Config.Lib(staticLibFile.getAbsolutePath(), true));
} else {
String message = String.format(
"Unsupported library type %s matched %s %s, in '%s'",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ public void testXCFrameworkLookupResolvedIntoStaticLib() throws Exception {
assertEquals(Collections.singletonList(frameworkLocation), config.getFrameworkPaths());
assertEquals(Collections.emptyList(), config.getFrameworks());
assertEquals(Arrays.asList(
new Lib(new File(xcFramework, "ios-x86_64-simulator/library-static3.a").getAbsolutePath(), false)),
new Lib(new File(xcFramework, "ios-x86_64-simulator/library-static3.a").getAbsolutePath(), true)),
config.getLibs());
}

Expand Down Expand Up @@ -591,7 +591,7 @@ public void testXCFrameworkResolved() throws Exception {
assertEquals(Collections.singletonList(frameworkLocation), config.getFrameworkPaths());
assertEquals(Collections.emptyList(), config.getFrameworks());
assertEquals(Arrays.asList(
new Lib(new File(xcFramework, "ios-x86_64-simulator/library-static3.a").getAbsolutePath(), false)),
new Lib(new File(xcFramework, "ios-x86_64-simulator/library-static3.a").getAbsolutePath(), true)),
config.getLibs());
}

Expand Down

0 comments on commit cd0c98f

Please sign in to comment.