summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhaoming Yin <zhaomingyin@google.com>2020-06-23 00:42:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-23 00:42:23 +0000
commit785ee9be1c5f114c3569cfb0e37a229bd38616a4 (patch)
treee253ce8d046823e7f4818b79619cba703e73f1f4
parente5e939a00c008e6c99dc7be629e5384f745ca08f (diff)
parent5e43ba5dd886db3f540844817697c6fbd91fb662 (diff)
downloaddevice_google_car-785ee9be1c5f114c3569cfb0e37a229bd38616a4.tar.gz
device_google_car-785ee9be1c5f114c3569cfb0e37a229bd38616a4.tar.bz2
device_google_car-785ee9be1c5f114c3569cfb0e37a229bd38616a4.zip
Fixed crosshatch_car_hwsan build issue am: 5e43ba5dd8android-11.0.0_r16android11-d1-b-release
Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/11936854 Change-Id: I7a0853616767f2424cde15f90eed2187a48dc89e
-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 \