diff --git a/device.mk b/device.mk
index 968f0c52..2e6c9e7e 100644
--- a/device.mk
+++ b/device.mk
@@ -632,6 +632,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	debug.hwc.winupdate=1
 
 # hw composer HAL
+$(call soong_config_set,google_displaycolor,displaycolor_platform,gs101)
 PRODUCT_PACKAGES += \
 	libdisplaycolor \
 	hwcomposer.$(TARGET_BOARD_PLATFORM)
diff --git a/edgetpu/edgetpu.mk b/edgetpu/edgetpu.mk
index 68003db2..ef74bcd0 100644
--- a/edgetpu/edgetpu.mk
+++ b/edgetpu/edgetpu.mk
@@ -35,6 +35,6 @@ PRODUCT_PACKAGES += \
 
 # TPU DBA HAL C API library
 PRODUCT_PACKAGES += \
-	libedgetpu_dba_hal
+	libedgetpu_dba_hal.google
 
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/edgetpu/