projectceladon · jsunintel · May 21, 2025
diff --git a/Android.bp b/Android.bp
diff --git a/Tools/MediaDriverTools/Android/GenerateAndroidBp.py b/Tools/MediaDriverTools/Android/GenerateAndroidBp.py
@@ -231,6 +231,7 @@ def __init__(self, root):
     def getCmakeCmd(self):
         wd = self.src
         cmd = 'cmake ' + wd + ' -DCMAKE_INSTALL_PREFIX=/usr'
+        cmd += ' -DENABLE_PRODUCTION_KMD=ON'
         cmd += ' -DBUILD_ALONG_WITH_CMRTLIB=1 -DBS_DIR_GMMLIB=' + path.join(wd, '../gmmlib/Source/GmmLib/')
         cmd += ' -DBS_DIR_COMMON=' + path.join(wd, '../gmmlib/Source/Common/')
         cmd += ' -DBS_DIR_INC=' + path.join(wd, '../gmmlib/Source/inc/')

diff --git a/media_common/agnostic/common/cp/media_srcs.cmake b/media_common/agnostic/common/cp/media_srcs.cmake
@@ -38,4 +38,6 @@ set(COMMON_CP_DIRECTORIES_
 set(CP_INTERFACE_DIRECTORIES_
     ${CP_INTERFACE_DIRECTORIES_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_common/agnostic/common/heap_manager/media_srcs.cmake b/media_common/agnostic/common/heap_manager/media_srcs.cmake
@@ -36,4 +36,6 @@ source_group( "Common Files" FILES ${TMP_HEADERS_} )
 set(SOFTLET_COMMON_PRIVATE_INCLUDE_DIRS_
     ${SOFTLET_COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_common/agnostic/common/hw/media_srcs.cmake b/media_common/agnostic/common/hw/media_srcs.cmake
@@ -118,4 +118,6 @@ set(SOFTLET_MHW_SFC_PRIVATE_INCLUDE_DIRS_
 set(SOFTLET_MHW_VEBOX_PRIVATE_INCLUDE_DIRS_
     ${SOFTLET_MHW_VEBOX_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_common/agnostic/common/hw/vdbox/media_srcs.cmake b/media_common/agnostic/common/hw/vdbox/media_srcs.cmake
@@ -53,4 +53,6 @@ set(TMP_SOFTLET_MHW_VDBOX_HUC_HEADERS_ "")
 set(SOFTLET_MHW_VDBOX_PRIVATE_INCLUDE_DIRS_
     ${SOFTLET_MHW_VDBOX_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_common/agnostic/common/media_interfaces/media_srcs.cmake b/media_common/agnostic/common/media_interfaces/media_srcs.cmake
@@ -34,4 +34,6 @@ set(SOFTLET_COMMON_HEADERS_
 set(SOFTLET_COMMON_PRIVATE_INCLUDE_DIRS_
     ${SOFTLET_COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_common/agnostic/common/os/media_srcs.cmake b/media_common/agnostic/common/os/media_srcs.cmake
@@ -41,3 +41,5 @@ set(SOFTLET_MOS_PUBLIC_INCLUDE_DIRS_
 )
 
 source_group( "mos_softlet" FILES ${TMP_HEADERS_} )
+
+media_add_curr_to_include_path()
diff --git a/media_common/agnostic/common/os/user_setting/media_srcs.cmake b/media_common/agnostic/common/os/user_setting/media_srcs.cmake
@@ -50,4 +50,6 @@ set(SOFTLET_COMMON_DLL_PRIVATE_INCLUDE_DIRS_
     ${CMAKE_CURRENT_LIST_DIR}
 )
 
-source_group( "mos_softlet" FILES ${TMP_HEADERS_} ${TMP_SHARED_HEADERS_} )
+source_group( "mos_softlet" FILES ${TMP_HEADERS_} ${TMP_SHARED_HEADERS_} )
+
+media_add_curr_to_include_path()
diff --git a/media_common/agnostic/common/renderhal/media_srcs.cmake b/media_common/agnostic/common/renderhal/media_srcs.cmake
@@ -34,4 +34,6 @@ source_group( "MHW\\Render Hal" FILES ${TMP_HEADERS_} )
 set(SOFTLET_COMMON_PRIVATE_INCLUDE_DIRS_
     ${SOFTLET_COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_common/agnostic/common/shared/media_srcs.cmake b/media_common/agnostic/common/shared/media_srcs.cmake
@@ -34,4 +34,6 @@ source_group( "Common Files" FILES ${TMP_SOURCES_} ${TMP_HEADERS_} )
 set(SOFTLET_COMMON_PRIVATE_INCLUDE_DIRS_
     ${SOFTLET_COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_common/agnostic/common/vp/hal/media_srcs.cmake b/media_common/agnostic/common/vp/hal/media_srcs.cmake
@@ -37,3 +37,5 @@ set (SOFTLET_VP_PRIVATE_INCLUDE_DIRS_
     ${SOFTLET_VP_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
 )
+
+media_add_curr_to_include_path()
diff --git a/media_common/agnostic/common/vp/kdll/media_srcs.cmake b/media_common/agnostic/common/vp/kdll/media_srcs.cmake
@@ -35,3 +35,4 @@ set (SOFTLET_VP_PRIVATE_INCLUDE_DIRS_
     ${CMAKE_CURRENT_LIST_DIR}
 )
 
+media_add_curr_to_include_path()
diff --git a/media_common/agnostic/common/vp/kernel/media_srcs.cmake b/media_common/agnostic/common/vp/kernel/media_srcs.cmake
@@ -37,4 +37,6 @@ set(TMP_HEADERS_ "")
 set (SOFTLET_VP_PRIVATE_INCLUDE_DIRS_
     ${SOFTLET_VP_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_common/linux/common/codec/media_srcs.cmake b/media_common/linux/common/codec/media_srcs.cmake
@@ -32,4 +32,6 @@ set(SOFTLET_CODEC_COMMON_PRIVATE_INCLUDE_DIRS_
     ${SOFTLET_CODEC_COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
 )
-endif()
+endif()
+
+media_add_curr_to_include_path()
diff --git a/media_common/linux/common/cp/ddi/media_srcs.cmake b/media_common/linux/common/cp/ddi/media_srcs.cmake
@@ -31,3 +31,5 @@ set(COMMON_CP_DIRECTORIES_
     ${COMMON_CP_DIRECTORIES_}
     ${CMAKE_CURRENT_LIST_DIR}
 )
+
+media_add_curr_to_include_path()
diff --git a/media_common/linux/common/cp/os/media_srcs.cmake b/media_common/linux/common/cp/os/media_srcs.cmake
@@ -43,3 +43,5 @@ set(CP_INTERFACE_DIRECTORIES_
     ${CMAKE_CURRENT_LIST_DIR}
 )
 endif()
+
+media_add_curr_to_include_path()
diff --git a/media_common/linux/common/os/media_srcs.cmake b/media_common/linux/common/os/media_srcs.cmake
@@ -44,3 +44,5 @@ set(SOFTLET_MOS_PUBLIC_INCLUDE_DIRS_
 )
 
 endif() # CMAKE_WDDM_LINUX
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_M/Xe_HPM/hw/media_srcs.cmake b/media_driver/agnostic/Xe_M/Xe_HPM/hw/media_srcs.cmake
@@ -49,4 +49,6 @@ source_group("MHW\\VEBOX" FILES ${TMP_VEBOX_SOURCES_} ${TMP_VEBOX_HEADERS_})
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_M/Xe_HPM/hw/vdbox/media_srcs.cmake b/media_driver/agnostic/Xe_M/Xe_HPM/hw/vdbox/media_srcs.cmake
@@ -53,4 +53,6 @@ source_group( "MHW\\Vdbox" FILES ${TMP_SOURCES_} ${TMP_HEADERS_} )
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_M/Xe_HPM/vp/hal/media_srcs.cmake b/media_driver/agnostic/Xe_M/Xe_HPM/vp/hal/media_srcs.cmake
@@ -61,3 +61,5 @@ set(VP_PRIVATE_INCLUDE_DIRS_
     ${VP_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
 )
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_M/Xe_XPM/hw/media_srcs.cmake b/media_driver/agnostic/Xe_M/Xe_XPM/hw/media_srcs.cmake
@@ -89,4 +89,6 @@ source_group("MHW\\Common MI" FILES ${TMP_MI_SOURCES_} ${TMP_MI_HEADERS_})
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_M/Xe_XPM/hw/vdbox/media_srcs.cmake b/media_driver/agnostic/Xe_M/Xe_XPM/hw/vdbox/media_srcs.cmake
@@ -52,4 +52,6 @@ source_group( "MHW\\Vdbox" FILES ${TMP_SOURCES_} ${TMP_HEADERS_} )
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_M/Xe_XPM/vp/hal/media_srcs.cmake b/media_driver/agnostic/Xe_M/Xe_XPM/vp/hal/media_srcs.cmake
@@ -70,3 +70,5 @@ set(VP_PRIVATE_INCLUDE_DIRS_
     ${VP_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
 )
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_M/Xe_XPM/vp/kernel/cmfcpatch/media_srcs.cmake b/media_driver/agnostic/Xe_M/Xe_XPM/vp/kernel/cmfcpatch/media_srcs.cmake
@@ -46,3 +46,5 @@ set(VP_PRIVATE_INCLUDE_DIRS_
     ${VP_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
 )
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_M/Xe_XPM/vp/kernel/media_srcs.cmake b/media_driver/agnostic/Xe_M/Xe_XPM/vp/kernel/media_srcs.cmake
@@ -51,3 +51,5 @@ set(VP_PRIVATE_INCLUDE_DIRS_
     ${VP_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
 )
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_M/Xe_XPM_plus/hw/vdbox/media_srcs.cmake b/media_driver/agnostic/Xe_M/Xe_XPM_plus/hw/vdbox/media_srcs.cmake
@@ -47,4 +47,5 @@ source_group( "MHW\\Vdbox" FILES ${TMP_SOURCES_} ${TMP_HEADERS_} )
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_M/Xe_XPM_plus/shared/media_srcs.cmake b/media_driver/agnostic/Xe_M/Xe_XPM_plus/shared/media_srcs.cmake
@@ -39,4 +39,5 @@ set(COMMON_HEADERS_
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_M/Xe_XPM_plus/vp/hal/media_srcs.cmake b/media_driver/agnostic/Xe_M/Xe_XPM_plus/vp/hal/media_srcs.cmake
@@ -59,3 +59,5 @@ set(VP_PRIVATE_INCLUDE_DIRS_
     ${VP_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
 )
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_M/Xe_XPM_plus/vp/kernel/cmfcpatch/media_srcs.cmake b/media_driver/agnostic/Xe_M/Xe_XPM_plus/vp/kernel/cmfcpatch/media_srcs.cmake
@@ -46,3 +46,5 @@ set(VP_PRIVATE_INCLUDE_DIRS_
     ${VP_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
 )
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_M/Xe_XPM_plus/vp/kernel/media_srcs.cmake b/media_driver/agnostic/Xe_M/Xe_XPM_plus/vp/kernel/media_srcs.cmake
@@ -49,4 +49,5 @@ set(TMP_HEADERS_ "")
 set(VP_PRIVATE_INCLUDE_DIRS_
     ${VP_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_R/Xe_HP/hw/render/media_srcs.cmake b/media_driver/agnostic/Xe_R/Xe_HP/hw/render/media_srcs.cmake
@@ -41,4 +41,6 @@ source_group("MHW\\Render Engine" FILES ${TMP_RENDER_SOURCES_} ${TMP_RENDER_HEAD
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_R/Xe_HPC/hw/blt/media_srcs.cmake b/media_driver/agnostic/Xe_R/Xe_HPC/hw/blt/media_srcs.cmake
@@ -42,4 +42,5 @@ source_group("MHW\\BLT" FILES ${TMP_BLT_SOURCES_} ${TMP_BLT_HEADERS_})
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_R/Xe_HPC/hw/render/media_srcs.cmake b/media_driver/agnostic/Xe_R/Xe_HPC/hw/render/media_srcs.cmake
@@ -42,4 +42,5 @@ source_group("MHW\\Render Engine" FILES ${TMP_RENDER_SOURCES_} ${TMP_RENDER_HEAD
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_R/Xe_HPG/hw/render/media_srcs.cmake b/media_driver/agnostic/Xe_R/Xe_HPG/hw/render/media_srcs.cmake
@@ -42,4 +42,6 @@ source_group("MHW\\Render Engine" FILES ${TMP_RENDER_SOURCES_} ${TMP_RENDER_HEAD
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_R/Xe_HP_base/hw/blt/media_srcs.cmake b/media_driver/agnostic/Xe_R/Xe_HP_base/hw/blt/media_srcs.cmake
@@ -42,4 +42,6 @@ source_group("MHW\\BLT" FILES ${TMP_BLT_SOURCES_} ${TMP_BLT_HEADERS_})
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/Xe_R/Xe_HP_base/hw/render/media_srcs.cmake b/media_driver/agnostic/Xe_R/Xe_HP_base/hw/render/media_srcs.cmake
@@ -43,4 +43,6 @@ source_group("MHW\\Render Engine" FILES ${TMP_RENDER_SOURCES_} ${TMP_RENDER_HEAD
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/common/hw/media_srcs.cmake b/media_driver/agnostic/common/hw/media_srcs.cmake
@@ -94,4 +94,6 @@ source_group("MHW\\BLT" FILES ${TMP_5_SOURCES_} ${TMP_5_HEADERS_})
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/common/hw/vdbox/media_srcs.cmake b/media_driver/agnostic/common/hw/vdbox/media_srcs.cmake
@@ -55,3 +55,5 @@ set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
 )
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/common/media_interfaces/media_srcs.cmake b/media_driver/agnostic/common/media_interfaces/media_srcs.cmake
@@ -44,4 +44,6 @@ set(COMMON_HEADERS_
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/common/renderhal/media_srcs.cmake b/media_driver/agnostic/common/renderhal/media_srcs.cmake
@@ -54,4 +54,6 @@ source_group( "MHW\\OCA" FILES ${TMP_SOURCES2_} ${TMP_HEADERS2_} )
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/common/shared/media_srcs.cmake b/media_driver/agnostic/common/shared/media_srcs.cmake
@@ -46,3 +46,5 @@ set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
 )
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/common/shared/mediacopy/media_srcs.cmake b/media_driver/agnostic/common/shared/mediacopy/media_srcs.cmake
@@ -38,4 +38,6 @@ source_group( "Common Files" FILES ${TMP_SOURCES_} ${TMP_HEADERS_} )
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/common/vp/hal/media_srcs.cmake b/media_driver/agnostic/common/vp/hal/media_srcs.cmake
@@ -115,3 +115,5 @@ set(VP_PRIVATE_INCLUDE_DIRS_
     ${VP_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
 )
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/common/vp/kdll/media_srcs.cmake b/media_driver/agnostic/common/vp/kdll/media_srcs.cmake
@@ -43,4 +43,6 @@ set(TMP_HEADERS_ "")
 set(VP_PRIVATE_INCLUDE_DIRS_
     ${VP_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/g12/g12_base/hw/render/media_srcs.cmake b/media_driver/agnostic/g12/g12_base/hw/render/media_srcs.cmake
@@ -44,4 +44,6 @@ source_group("MHW\\Render Engine" FILES ${TMP_RENDER_SOURCES_} ${TMP_RENDER_HEAD
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/gen11/cm/media_srcs.cmake b/media_driver/agnostic/gen11/cm/media_srcs.cmake
@@ -41,4 +41,6 @@ source_group( "CM" FILES ${TMP_SOURCES_} ${TMP_HEADERS_} )
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/gen11/hw/media_srcs.cmake b/media_driver/agnostic/gen11/hw/media_srcs.cmake
@@ -101,4 +101,6 @@ source_group("MHW\\State Heap" FILES ${TMP_5_SOURCES_} ${TMP_5_HEADERS_})
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/gen11/hw/vdbox/media_srcs.cmake b/media_driver/agnostic/gen11/hw/vdbox/media_srcs.cmake
@@ -56,4 +56,6 @@ source_group( "MHW\\Vdbox" FILES ${TMP_SOURCES_} ${TMP_HEADERS_} )
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/gen11/renderhal/media_srcs.cmake b/media_driver/agnostic/gen11/renderhal/media_srcs.cmake
@@ -42,4 +42,6 @@ source_group( "MHW\\Render Hal" FILES ${TMP_SOURCES_} ${TMP_HEADERS_} )
 set(COMMON_PRIVATE_INCLUDE_DIRS_
     ${COMMON_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+
+media_add_curr_to_include_path()
diff --git a/media_driver/agnostic/gen11/vp/hal/media_srcs.cmake b/media_driver/agnostic/gen11/vp/hal/media_srcs.cmake
@@ -50,4 +50,5 @@ set(TMP_HEADERS_ "")
 set(VP_PRIVATE_INCLUDE_DIRS_
     ${VP_PRIVATE_INCLUDE_DIRS_}
     ${CMAKE_CURRENT_LIST_DIR}
-)
+)
+media_add_curr_to_include_path()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,3 +41,5 @@ set(SOFTLET_MOS_PUBLIC_INCLUDE_DIRS_
		)

		source_group( "mos_softlet" FILES ${TMP_HEADERS_} )

		media_add_curr_to_include_path()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,3 +35,4 @@ set (SOFTLET_VP_PRIVATE_INCLUDE_DIRS_
		${CMAKE_CURRENT_LIST_DIR}
		)

		media_add_curr_to_include_path()
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,3 +43,5 @@ set(CP_INTERFACE_DIRECTORIES_ @@
         ${CMAKE_CURRENT_LIST_DIR}
     )
     endif()
+    media_add_curr_to_include_path()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,3 +44,5 @@ set(SOFTLET_MOS_PUBLIC_INCLUDE_DIRS_
		)

		endif() # CMAKE_WDDM_LINUX

		media_add_curr_to_include_path()