diff --git a/phhgsi_arm_a/BoardConfig.mk b/phhgsi_arm_a/BoardConfig.mk
index aeae535..6b72ea3 100644
--- a/phhgsi_arm_a/BoardConfig.mk
+++ b/phhgsi_arm_a/BoardConfig.mk
@@ -1,5 +1,4 @@
 include build/make/target/board/generic_arm_a/BoardConfig.mk
+include device/phh/treble/board-base.mk
 
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824
-TARGET_SYSTEM_PROP := device/phh/treble/system.prop $(TARGET_SYSTEM_PROP)
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/phh/treble/bluetooth