Merge branch 'bugfix/fix_memory_layout_h_ci_issue' into 'master'

host tests: add missing header files for compiling host tests

See merge request espressif/esp-idf!14430

components/fatfs/test_fatfs_host/Makefile.files

@@ -30,6 +30,7 @@ INCLUDE_DIRS := \
 		xtensa/include \
 		xtensa/esp32/include \
 		soc/esp32/include \
+                heap/include \
 		soc/include \
 		esp32/include \
 		esp_common/include \

components/spi_flash/sim/Makefile.files

@@ -32,6 +32,7 @@ INCLUDE_DIRS := \
 	xtensa/include \
 	xtensa/esp32/include \
 	soc/esp32/include \
+       	heap/include \
 	soc/include \
 	esp32/include \
 	esp_timer/include \

components/spi_flash/sim/stubs/Makefile.files

@@ -24,6 +24,7 @@ INCLUDE_DIRS := \
 	esp_hw_support/include/soc \
 	esp_system/include \
 	soc/esp32/include \
+        heap/include \
 	soc/include \
 	xtensa/include \
 	xtensa/esp32/include \

components/spiffs/test_spiffs_host/Makefile.files

@@ -31,6 +31,7 @@ INCLUDE_DIRS := \
 	xtensa/include \
 	xtensa/esp32/include \
 	soc/esp32/include \
+      	heap/include \
 	soc/include \
 	esp32/include \
 	bootloader_support/include \

components/wear_levelling/test_wl_host/Makefile

@@ -25,7 +25,7 @@ else
 SDKCONFIG_DIR := $(dir $(realpath $(SDKCONFIG)))
 endif
 
-INCLUDE_FLAGS := $(addprefix -I, $(INCLUDE_DIRS) $(SDKCONFIG_DIR) ../../../tools/catch)
+INCLUDE_FLAGS := $(addprefix -I, $(INCLUDE_DIRS) -I../../../heap/include/soc $(SDKCONFIG_DIR) ../../../tools/catch)
 
 CPPFLAGS += $(INCLUDE_FLAGS) -g -m32
 CXXFLAGS += $(INCLUDE_FLAGS) -std=c++11 -g -m32

components/wear_levelling/test_wl_host/Makefile.files

@@ -22,6 +22,7 @@ INCLUDE_DIRS := \
 	vfs/include \
 	) \
 	$(addprefix ../../../components/, \
+	heap/include \
 	esp_rom/include \
 	esp_system/include \
 	esp_common/include \
@@ -30,6 +31,7 @@ INCLUDE_DIRS := \
 	xtensa/include \
 	xtensa/esp32/include \
 	soc/esp32/include \
+      	heap/include \
 	soc/include \
 	esp32/include \
 	bootloader_support/include \