commit 705a670d50c47d04387971ed86602ad59103c994
author android-build-team Robot <android-build-team-robot@google.com> Wed Jun 24 01:01:04 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jun 24 01:01:04 2020 +0000
tree e253ce8d046823e7f4818b79619cba703e73f1f4
parent bfe54e48590f4d3e2d61f3dc323f40b3a9133358
parent 785ee9be1c5f114c3569cfb0e37a229bd38616a4

Snap for 6621721 from 785ee9be1c5f114c3569cfb0e37a229bd38616a4 to rvc-d1-release

Change-Id: I5ba74c3a3583674bc6715af9d549844d7b116bf0

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 \