Fix includes attribute resolution in apple_static_xcframework_import#2869
Open
olbapmar wants to merge 1 commit intobazelbuild:mainfrom
Open
Fix includes attribute resolution in apple_static_xcframework_import#2869olbapmar wants to merge 1 commit intobazelbuild:mainfrom
olbapmar wants to merge 1 commit intobazelbuild:mainfrom
Conversation
olbapmar
force-pushed
the
includes_static_framework_import
branch
from
714bd9b to
fad30c9
Compare
The documentation states that the `includes` attribute paths are interpreted relative to the single platform directory inside the XCFramework. However, the previous implementation simply concatenated user-specified includes with The xcframework library includes, without properly resolving them relative to the platform directory. This change fixes the path resolution for the `includes` attribute: - For library-style XCFrameworks: the binary is directly in the platform directory, so includes are resolved relative to binary.dirname. - For framework-style XCFrameworks: the binary is inside the .framework bundle, so we go up one level (using binary.dirname's dirname) to reach the platform directory before joining with the user-specified include path.
olbapmar
force-pushed
the
includes_static_framework_import
branch
from
fad30c9 to
a948995
Compare
olbapmar
requested review from
aaronsky,
adincebic,
brentleyjones,
keith,
luispadron and
mattrobmattrob
as code owners
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The documentation states that the
includesattribute paths are interpreted relative to the single platform directory inside the XCFramework. However, the previous implementation simply concatenated user-specified includes with The xcframework library includes, without properly resolving them relative to the platform directory.This change fixes the path resolution for the
includesattribute:This pull request also adds tests verifying the right behavior of include paths handling.