diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-12-30 18:53:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-30 18:53:04 +0000 |
| commit | ab811752fcd0964ce928c1d2f1ab391aa4f58c81 (patch) | |
| tree | 9cd6c36fe0472b10a4640f9f9092773f0682e407 | |
| parent | 13342850c042957efd2be7fb8fa718e688567149 (diff) | |
| parent | e0c16d2ebcc879146e11e2244e74ee9036598db7 (diff) | |
| download | cuttlefish-ab811752fcd0964ce928c1d2f1ab391aa4f58c81.tar.gz | |
Merge "Don't override existing BOARD_BOOT_HEADER_VERSIONs"
| -rw-r--r-- | shared/BoardConfig.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk index cb20c4ad3..817d58d74 100644 --- a/shared/BoardConfig.mk +++ b/shared/BoardConfig.mk @@ -241,7 +241,9 @@ BOARD_BOOTCONFIG += \ androidboot.vendor.apex.com.android.wifi.hal=com.google.cf.wifi BOARD_INCLUDE_DTB_IN_BOOTIMG := true +ifndef BOARD_BOOT_HEADER_VERSION BOARD_BOOT_HEADER_VERSION := 4 +endif BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) BOARD_INIT_BOOT_HEADER_VERSION := 4 BOARD_MKBOOTIMG_INIT_ARGS += --header_version $(BOARD_INIT_BOOT_HEADER_VERSION) |