diff options
| -rw-r--r-- | bootloader_message/Android.bp | 1 | ||||
| -rw-r--r-- | bootloader_message/include/bootloader_message/bootloader_message.h | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/bootloader_message/Android.bp b/bootloader_message/Android.bp index 778fdb93..23b8e70d 100644 --- a/bootloader_message/Android.bp +++ b/bootloader_message/Android.bp @@ -25,6 +25,7 @@ package { cc_defaults { name: "libbootloader_message_defaults", + defaults: ["bootloader_message_offset_defaults"], srcs: ["bootloader_message.cpp"], cflags: [ "-Wall", diff --git a/bootloader_message/include/bootloader_message/bootloader_message.h b/bootloader_message/include/bootloader_message/bootloader_message.h index d58158dd..45041e53 100644 --- a/bootloader_message/include/bootloader_message/bootloader_message.h +++ b/bootloader_message/include/bootloader_message/bootloader_message.h @@ -29,11 +29,11 @@ // 32K - 64K System space, used for miscellanious AOSP features. See below. // Note that these offsets are admitted by bootloader,recovery and uncrypt, so they // are not configurable without changing all of them. -constexpr size_t BOOTLOADER_MESSAGE_OFFSET_IN_MISC = 0; -constexpr size_t VENDOR_SPACE_OFFSET_IN_MISC = 2 * 1024; -constexpr size_t WIPE_PACKAGE_OFFSET_IN_MISC = 16 * 1024; -constexpr size_t SYSTEM_SPACE_OFFSET_IN_MISC = 32 * 1024; -constexpr size_t SYSTEM_SPACE_SIZE_IN_MISC = 32 * 1024; +constexpr size_t BOOTLOADER_MESSAGE_OFFSET_IN_MISC = BOARD_RECOVERY_BLDRMSG_OFFSET; +constexpr size_t VENDOR_SPACE_OFFSET_IN_MISC = 2 * 1024 + BOARD_RECOVERY_BLDRMSG_OFFSET; +constexpr size_t WIPE_PACKAGE_OFFSET_IN_MISC = 16 * 1024 + BOARD_RECOVERY_BLDRMSG_OFFSET; +constexpr size_t SYSTEM_SPACE_OFFSET_IN_MISC = 32 * 1024 + BOARD_RECOVERY_BLDRMSG_OFFSET; +constexpr size_t SYSTEM_SPACE_SIZE_IN_MISC = 32 * 1024 + BOARD_RECOVERY_BLDRMSG_OFFSET; /* Bootloader Message (2-KiB) * |