Merge branch 'refactor/protocomm_public_hdr_v5.0' into 'release/v5.0'

refactor(protocomm): Make the protocomm `proto-c` headers public (v5.0)

See merge request espressif/esp-idf!37786
This commit is contained in:
Mahavir Jain
2025-03-21 12:02:15 +08:00
4 changed files with 6 additions and 5 deletions

View File

@@ -1,5 +1,5 @@
set(include_dirs include) set(include_dirs include)
set(priv_include_dirs proto-c src ../protocomm/proto-c) set(priv_include_dirs proto-c src)
set(srcs "src/esp_local_ctrl.c" set(srcs "src/esp_local_ctrl.c"
"src/esp_local_ctrl_handler.c" "src/esp_local_ctrl_handler.c"
"proto-c/esp_local_ctrl.pb-c.c") "proto-c/esp_local_ctrl.pb-c.c")

View File

@@ -1,7 +1,9 @@
set(include_dirs include/common set(include_dirs include/common
include/security include/security
include/transports) include/transports
set(priv_include_dirs proto-c src/common src/crypto/srp6a/include) proto-c)
set(priv_include_dirs src/common
src/crypto/srp6a/include)
set(srcs set(srcs
"src/common/protocomm.c" "src/common/protocomm.c"
"proto-c/constants.pb-c.c" "proto-c/constants.pb-c.c"

View File

@@ -1,5 +1,4 @@
idf_component_register(SRC_DIRS "." idf_component_register(SRC_DIRS "."
PRIV_INCLUDE_DIRS "." PRIV_INCLUDE_DIRS "."
PRIV_INCLUDE_DIRS "../proto-c/"
PRIV_REQUIRES cmock mbedtls protocomm protobuf-c test_utils) PRIV_REQUIRES cmock mbedtls protocomm protobuf-c test_utils)
target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format") target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")

View File

@@ -20,6 +20,6 @@ endif()
idf_component_register(SRCS "${srcs}" idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS include INCLUDE_DIRS include
PRIV_INCLUDE_DIRS src proto-c ../protocomm/proto-c PRIV_INCLUDE_DIRS src proto-c
REQUIRES lwip protocomm REQUIRES lwip protocomm
PRIV_REQUIRES protobuf-c bt json esp_timer esp_wifi) PRIV_REQUIRES protobuf-c bt json esp_timer esp_wifi)