Skip to content
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

Jump to bottom

BLE: fix conflicting include by qualifying cordio pal includes #10042

Merged
merged 1 commit into from
Mar 12, 2019
Merged

BLE: fix conflicting include by qualifying cordio pal includes #10042

merged 1 commit into from
Mar 12, 2019

Conversation

paul-szczepanek-arm
Copy link
Member

Description

Fix #10022 by adding the full path to the include.

Pull request type

[x] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

Reviewers

@donatieng

Release Notes

@paul-szczepanek-arm paul-szczepanek-arm mentioned this pull request Mar 11, 2019
Closed
@adbridge
Copy link
Contributor

This requires the matching client change

0xc0170
0xc0170 approved these changes Mar 11, 2019
View reviewed changes
Copy link
Contributor

@0xc0170 0xc0170 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed all pal_ headers

0xc0170
0xc0170 reviewed Mar 11, 2019
View reviewed changes
features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/sources/sec/common/sec_main.c
@@ -31,7 +31,7 @@
#include "hci_api.h"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

out of curiosity - hci_ is not using relative paths like util or pal, why?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because it's not part of pal. This is an external codebase. This is not a valid long term solution and is a stopgap until we fix our build system.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This problem has been solved many times and we don't have to develop any cutting edge technology, mbed_lib.json can have a list of include dirs it exports and other libs that require them can import them:
so for cordio host stack it would be "export_include": ["stack/include/wsf/"]
and each library that needed it like cordio controller "depends": ["CORDIO"] which will import the includes that were exported.

donatieng
donatieng approved these changes Mar 11, 2019
View reviewed changes
Copy link
Contributor

@donatieng donatieng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - thanks @paul-szczepanek-arm

@adbridge
Copy link
Contributor

I've marked this "needs preceding PR" but presumably the other changes are to client code so won't affect us releasing ?

@donatieng
Copy link
Contributor

Indeed @adbridge 👍

@ghost ghost added the PM_ACCEPTED label Mar 11, 2019
@cmonr
Copy link
Contributor

cmonr commented Mar 12, 2019

CI started

@mbed-ci
Copy link

mbed-ci commented Mar 12, 2019

Test run: SUCCESS

Summary: 13 of 13 test jobs passed
Build number : 1
Build artifacts

@0xc0170 0xc0170 merged commit 84e4dec into ARMmbed:master Mar 12, 2019
This was referenced Dec 1, 2020
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0xc0170 0xc0170 0xc0170 approved these changes

@pan- pan- pan- approved these changes

@donatieng donatieng donatieng approved these changes

Assignees
No one assigned
Labels
release-version: 5.12.0-rc2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@paul-szczepanek-arm @adbridge @donatieng @cmonr @mbed-ci @pan- @0xc0170