Merge commit 'd794cadaa862d4074e9a2778e92acf7b3dd02515' into HEAD
Change-Id: I6e78a6f7565ce0bf703833988fc602dd47cec3e5
diff --git a/boot_control.cpp b/boot_control.cpp
index 435ea2f..947e0d5 100644
--- a/boot_control.cpp
+++ b/boot_control.cpp
@@ -49,7 +49,7 @@
#include "gpt-utils.h"
#define BOOTDEV_DIR "/dev/block/bootdevice/by-name"
-#define BOOT_IMG_PTN_NAME "boot"
+#define BOOT_IMG_PTN_NAME "boot_"
#define LUN_NAME_END_LOC 14
#define BOOT_SLOT_PROP "ro.boot.slot_suffix"
@@ -266,6 +266,8 @@
while ((de = readdir(dir_bootdev))) {
if (de->d_name[0] == '.')
continue;
+ static_assert(AB_SLOT_A_SUFFIX[0] == '_', "Breaking change to slot A suffix");
+ static_assert(AB_SLOT_B_SUFFIX[0] == '_', "Breaking change to slot B suffix");
if (!strncmp(de->d_name, BOOT_IMG_PTN_NAME,
strlen(BOOT_IMG_PTN_NAME)))
slot_count++;