diff --git a/BoardConfig.mk b/BoardConfig.mk
index 9df3053a19f1b7b1d6e4850da091a4c34f7bd0f7..3e823937515fac73925ea937d0ab6f59df85f9ff 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -34,7 +34,9 @@ TARGET_BOARD_PLATFORM_GPU := qcom-adreno506
 
 TARGET_BOARD_SUFFIX := _64
 
+# Build broken
 BUILD_BROKEN_DUP_RULES := true
+BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true
 
 # AVB
 BOARD_AVB_ENABLE := true