diff --git a/phhgsi_arm64_a/BoardConfig.mk b/phhgsi_arm64_a/BoardConfig.mk
index 2cd43c5..1c16774 100644
--- a/phhgsi_arm64_a/BoardConfig.mk
+++ b/phhgsi_arm64_a/BoardConfig.mk
@@ -1,5 +1,4 @@
 include build/make/target/board/generic_arm64_a/BoardConfig.mk
+include device/phh/treble/board-base.mk
 
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
-TARGET_SYSTEM_PROP := device/phh/treble/system.prop $(TARGET_SYSTEM_PROP)
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/phh/treble/bluetooth