commit 5c1676a6f584a8ba4a60c52b55840e2f7bf46a2e
author android-build-team Robot <android-build-team-robot@google.com> Wed Jun 24 01:04:47 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jun 24 01:04:47 2020 +0000
tree e253ce8d046823e7f4818b79619cba703e73f1f4
parent 58219f0bc52e2d4c9e3a17cebaabdc938af4d361
parent 5e43ba5dd886db3f540844817697c6fbd91fb662

Snap for 6621766 from 5e43ba5dd886db3f540844817697c6fbd91fb662 to rvc-release

Change-Id: Ic7cc09f9254ff91078acc105192f39104f8e1a29

crosshatch_car/device-common.mk

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 @@
 #
 
 # 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 \