summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2020-01-12 14:05:56 -0800
committerandroid-build-merger <android-build-merger@google.com>2020-01-12 14:05:56 -0800
commit929d56f3131763e6a3db6418ae32091db07d5f55 (patch)
treece34026e51d64bc9f13cdb6c36f8b171689c3056
parent3d2c018358ad588dd1f8cae0e9a839f5b50b75ec (diff)
parentd58f8768f8dfc2f8a50aec235149248d690b0387 (diff)
downloaddevice_generic_art-929d56f3131763e6a3db6418ae32091db07d5f55.tar.gz
device_generic_art-929d56f3131763e6a3db6418ae32091db07d5f55.tar.bz2
device_generic_art-929d56f3131763e6a3db6418ae32091db07d5f55.zip
Move PRODUCT_* variable from BoardConfig to product makefile
am: d58f8768f8 Change-Id: Ib674a061457821c08b264b6257adb7d8a30e032a
-rw-r--r--arm_v7_v8/BoardConfig.mk4
-rw-r--r--arm_v7_v8/arm_v7_v8.mk3
2 files changed, 4 insertions, 3 deletions
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 @@ TARGET_SUPPORTS_64_BIT_APPS := true
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_NAME := arm_v7_v8
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