diff options
| author | Zhaoming Yin <zhaomingyin@google.com> | 2020-06-23 00:42:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 00:42:27 +0000 |
| commit | 1264922c3c0ec155878e1cc484370dbf8f91d2e3 (patch) | |
| tree | e253ce8d046823e7f4818b79619cba703e73f1f4 | |
| parent | e7f0f04ea1c03cf608c7321b73c16f3c9497973e (diff) | |
| parent | 5e43ba5dd886db3f540844817697c6fbd91fb662 (diff) | |
| download | google_car-android11-mainline-permission-release.tar.gz | |
Fixed crosshatch_car_hwsan build issue am: 5e43ba5dd8android-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseaml_tz2_305400100
Original change: https://googleplex-android-review.googlesource.com/c/device/google_car/+/11936854
Change-Id: Ife9f42b2ce11a711762f18f84d79a17edd33a716
| -rw-r--r-- | crosshatch_car/device-common.mk | 6 |
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 \ |