Merge "aosp_x86_arm builds have overriding commands"

am: 6ae08c1416 Change-Id: Ie3cf105dfa9fca4c2e26e2a5e96b992a1be343b6
2018-06-20 10:03:54 -07:00 · 2018-06-20 10:03:54 -07:00 · 93e1a187c7
parent 4f38769dd0 6ae08c1416
commit 93e1a187c7
1 changed files with 2 additions and 0 deletions
--- a/target/board/generic_x86_arm/BoardConfig.mk
+++ b/target/board/generic_x86_arm/BoardConfig.mk
@ -31,6 +31,8 @@ TARGET_2ND_CPU_VARIANT := generic
 # Tell the build system this isn't a typical 64bit+32bit multilib configuration.
 TARGET_TRANSLATE_2ND_ARCH := true

+BUILD_BROKEN_DUP_RULES := true
+
 # no hardware camera
 USE_CAMERA_STUB := true