Skip to content

Fix apple_static_framework_import with swiftinterface #753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keith merged 1 commit into from
Aug 7, 2020
Merged

Fix apple_static_framework_import with swiftinterface #753

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions apple/internal/apple_framework_import.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,15 @@ def _swiftmodule_for_cpu(swiftmodule_files, cpu):
# ABC.framework/Modules/ABC.swiftmodule/<arch>.swiftmodule
# Where <arch> will be a common arch like x86_64, arm64, etc.
named_files = {f.basename: f for f in swiftmodule_files}
for extension in ("swiftinterface", "swiftmodule"):
module = named_files.get("{}.{}".format(cpu, extension))
if not module and cpu == "armv7":
module = named_files.get("arm.{}".format(extension))

module = named_files.get("{}.swiftmodule".format(cpu))
if not module and cpu == "armv7":
module = named_files.get("arm.swiftmodule")
if module:
return module

return module
return None

def _classify_framework_imports(framework_imports):
"""Classify a list of framework files into bundling, header, or module_map."""
Expand Down