Merge branch 'bugfix/remove_duplicate_hci_common' into 'master'

fix(nimble): Merge hci_common.h file for all chips Closes BLERP-538 See merge request espressif/esp-idf!28787
2024-02-01 10:46:50 +08:00
parent d749575648 6c614a50ab
commit 20171bf19d
3 changed files with 2 additions and 2010 deletions
--- a/components/bt/CMakeLists.txt
+++ b/components/bt/CMakeLists.txt
@ -615,6 +615,7 @@ if(CONFIG_BT_ENABLED)
        list(APPEND include_dirs

                    host/nimble/nimble/nimble/host/include
+                    host/nimble/nimble/nimble/include
                    host/nimble/nimble/nimble/host/services/ans/include
                    host/nimble/nimble/nimble/host/services/bas/include
                    host/nimble/nimble/nimble/host/services/dis/include
--- a/components/bt/host/nimble/nimble
+++ b/components/bt/host/nimble/nimble
--- a/components/bt/porting/nimble/include/nimble/hci_common.h
+++ b/components/bt/porting/nimble/include/nimble/hci_common.h