Merge 24Q4 (ab/12406339) into aosp-main-future

Bug: 370570306
Merged-In: I0c0a39e3fc03d8df4e9e87cf61fb8e1dafcfc996
Change-Id: I0a719e67f7b9a5fb35b6d7f29a02bf6912946a31
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 22a3c97..4a8faa1 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -237,6 +237,8 @@
 
 BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_gs101
 BOARD_LIBACRYL_G2D_HDR_PLUGIN := libacryl_hdr_plugin
+$(call soong_config_set,acryl,libacryl_g2d_hdr_plugin,//hardware/google/graphics/gs101/libacryl_plugins:libacryl_hdr_plugin)
+$(call soong_config_set,acryl,libacryl_c_include,hardware/google/graphics/$(TARGET_BOARD_PLATFORM)/libcap)
 
 # HWCServices
 BOARD_USES_HWC_SERVICES := true