commit b1275584df121c182ca91e9a80f091d46f7435c2
author android-build-team Robot <android-build-team-robot@google.com> Tue Jun 23 03:02:59 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jun 23 03:02:59 2020 +0000
tree e253ce8d046823e7f4818b79619cba703e73f1f4
parent 1551860d572a39a15d01fe6fb608ac1928caf5bf
parent 1264922c3c0ec155878e1cc484370dbf8f91d2e3

Snap for 6618402 from 1264922c3c0ec155878e1cc484370dbf8f91d2e3 to mainline-release

Change-Id: I0abec647b57e7c30f5d3c5e5d1acef18a67ab84b

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 \