Move PRODUCT_* variable from BoardConfig to product makefile
The PRODUCT_* variables are becoming readonly in BoardConfig.mk files.
Bug: 68153540
Test: lunch arm_v7_v8; get_build_var PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD
Change-Id: I9ea7a27bbb5b73ca11f66a8b6f4982320500db7d
diff --git a/arm_v7_v8/BoardConfig.mk b/arm_v7_v8/BoardConfig.mk
index b26b032..0ebff4c 100644
--- a/arm_v7_v8/BoardConfig.mk
+++ b/arm_v7_v8/BoardConfig.mk
@@ -34,7 +34,5 @@
USE_CLANG_PLATFORM_BUILD := true
-# Disable debug binaries and dexpreopt for
-# an unbundled ART build.
-PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false
+# Disable dexpreopt for an unbundled ART build.
WITH_DEXPREOPT := false
diff --git a/arm_v7_v8/arm_v7_v8.mk b/arm_v7_v8/arm_v7_v8.mk
index 8c1d293..e25e8e8 100644
--- a/arm_v7_v8/arm_v7_v8.mk
+++ b/arm_v7_v8/arm_v7_v8.mk
@@ -20,3 +20,6 @@
PRODUCT_DEVICE := arm_v7_v8
PRODUCT_BRAND := Android
PRODUCT_MODEL := ARM v7 and v8
+
+# Disable debug binaries for an unbundled ART build.
+PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false
