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.

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

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

Merged
merged 1 commit into from Mar 12, 2019

Conversation

Projects
None yet
8 participants
@paul-szczepanek-arm
Copy link
Member

commented Mar 11, 2019

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

@adbridge

This comment has been minimized.

Copy link
Contributor

commented Mar 11, 2019

This requires the matching client change

@0xc0170
Copy link
Member

left a comment

Fixed all pal_ headers

@@ -31,7 +31,7 @@
#include "hci_api.h"

This comment has been minimized.

Copy link
@0xc0170

0xc0170 Mar 11, 2019

Member

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

This comment has been minimized.

Copy link
@paul-szczepanek-arm

paul-szczepanek-arm Mar 11, 2019

Author Member

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.

This comment has been minimized.

Copy link
@paul-szczepanek-arm

paul-szczepanek-arm Mar 11, 2019

Author Member

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
Copy link
Member

left a comment

LGTM - thanks @paul-szczepanek-arm

@adbridge

This comment has been minimized.

Copy link
Contributor

commented Mar 11, 2019

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

@donatieng

This comment has been minimized.

Copy link
Member

commented Mar 11, 2019

Indeed @adbridge 👍

@pan-

pan- approved these changes Mar 11, 2019

@cmonr

This comment has been minimized.

Copy link
Contributor

commented Mar 12, 2019

CI started

@mbed-ci

This comment has been minimized.

Copy link

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

28 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
jenkins-ci/build-ARMC5 Success
Details
jenkins-ci/build-ARMC6 Success
Details
jenkins-ci/build-GCC_ARM Success
Details
jenkins-ci/build-IAR8 Success
Details
jenkins-ci/cloud-client-test Success
Details
jenkins-ci/dynamic-memory-usage RTOS ROM(+0 bytes) RAM(+0 bytes)
Details
jenkins-ci/exporter Success
Details
jenkins-ci/greentea-test Success
Details
jenkins-ci/mbed2-build-ARMC5 Success
Details
jenkins-ci/mbed2-build-ARMC6 Success
Details
jenkins-ci/mbed2-build-GCC_ARM Success
Details
jenkins-ci/mbed2-build-IAR8 Success
Details
jenkins-ci/unittests Success
Details
travis-ci/astyle Local astyle testing has passed
Details
travis-ci/docs Local docs testing has passed
Details
travis-ci/doxy-spellcheck Local doxy-spellcheck testing has passed
Details
travis-ci/events Passed, runtime is 10316 cycles (+9 cycles)
Details
travis-ci/gitattributestest Local gitattributestest testing has passed
Details
travis-ci/include_check Local include_check testing has passed
Details
travis-ci/licence_check Local licence_check testing has passed
Details
travis-ci/littlefs Passed, code size is 8408B (+0.00%)
Details
travis-ci/psa-autogen Local psa-autogen testing has passed
Details
travis-ci/tools-py2.7 Local tools-py2.7 testing has passed
Details
travis-ci/tools-py3.5 Local tools-py3.5 testing has passed
Details
travis-ci/tools-py3.6 Local tools-py3.6 testing has passed
Details
travis-ci/tools-py3.7 Local tools-py3.7 testing has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.