summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhaoming Yin <zhaomingyin@google.com>2020-06-19 14:50:34 -0700
committerGaurav Sarode <sgaurav@google.com>2020-06-19 22:49:49 +0000
commit5e43ba5dd886db3f540844817697c6fbd91fb662 (patch)
treee253ce8d046823e7f4818b79619cba703e73f1f4
parent0ac8af6348a235b564804a2464abd63a69dbc75e (diff)
downloaddevice_google_car-5e43ba5dd886db3f540844817697c6fbd91fb662.tar.gz
device_google_car-5e43ba5dd886db3f540844817697c6fbd91fb662.tar.bz2
device_google_car-5e43ba5dd886db3f540844817697c6fbd91fb662.zip
Fixed crosshatch_car_hwsan build issueandroid11-dev
The build was failing due to small BOARD_SUPER_PARTITION_SIZE Bug: 159468232 Test: SANITIZE_TARGET=hwasan m Change-Id: Idd764fbf519de3f77c5905792fcb86536ee8e326
-rw-r--r--crosshatch_car/device-common.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/crosshatch_car/device-common.mk b/crosshatch_car/device-common.mk
index 73d5389..da765fb 100644
--- a/crosshatch_car/device-common.mk
+++ b/crosshatch_car/device-common.mk
@@ -140,9 +140,13 @@ PRODUCT_PACKAGES += \
#
# Enable retrofit dynamic partitions for all blueline
-# and crosshatch targets
+# and crosshatch (except for hwaddress) targets
PRODUCT_USE_DYNAMIC_PARTITIONS := true
+ifneq (,$(filter hwaddress, $(SANITIZE_TARGET)))
+PRODUCT_RETROFIT_DYNAMIC_PARTITIONS := false
+else
PRODUCT_RETROFIT_DYNAMIC_PARTITIONS := true
+endif
PRODUCT_PACKAGES += \
android.hardware.boot@1.0-impl.recovery \
bootctrl.sdm845 \