Skip to content

Commit c12fd05

Browse files
authored
Merge pull request #287 from espressif/Matter-1.4-Resolve-Include
fixes Matter 1.4 Resolve Include Macro
2 parents d7f03cf + ce6f193 commit c12fd05

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Diff for: tools/copy-libs.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -525,9 +525,10 @@ for flag_file in "c_flags" "cpp_flags" "S_flags"; do
525525
sed 's/\\\"-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib\/address_resolve\/AddressResolve_DefaultImpl.h>\\\"/-DCHIP_HAVE_CONFIG_H/' $FLAGS_DIR/$flag_file > $FLAGS_DIR/$flag_file.temp
526526
mv $FLAGS_DIR/$flag_file.temp $FLAGS_DIR/$flag_file
527527
done
528-
CHIP_RESOLVE_DIR="$AR_SDK/include/espressif__esp_matter/connectedhomeip/connectedhomeip/src/lib/address_resolve"
529-
sed 's/CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER/<lib\/address_resolve\/AddressResolve_DefaultImpl.h>/' $CHIP_RESOLVE_DIR/AddressResolve.h > $CHIP_RESOLVE_DIR/AddressResolve_temp.h
530-
mv $CHIP_RESOLVE_DIR/AddressResolve_temp.h $CHIP_RESOLVE_DIR/AddressResolve.h
528+
# this is not necessary for Matter 1.4, but it is for Matter 1.3
529+
#CHIP_RESOLVE_DIR="$AR_SDK/include/espressif__esp_matter/connectedhomeip/connectedhomeip/src/lib/address_resolve"
530+
#sed 's/CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER/<lib\/address_resolve\/AddressResolve_DefaultImpl.h>/' $CHIP_RESOLVE_DIR/AddressResolve.h > $CHIP_RESOLVE_DIR/AddressResolve_temp.h
531+
#mv $CHIP_RESOLVE_DIR/AddressResolve_temp.h $CHIP_RESOLVE_DIR/AddressResolve.h
531532
# End of Matter Library adjustments
532533

533534
# sdkconfig

0 commit comments

Comments
 (0)