Merge "Merge libsync_recovery rules into libsync."
diff --git a/bootstat/bootstat.cpp b/bootstat/bootstat.cpp
index d909ec6..c17e00f 100644
--- a/bootstat/bootstat.cpp
+++ b/bootstat/bootstat.cpp
@@ -186,7 +186,7 @@
{"wdog_bark", 42},
{"wdog_bite", 43},
{"wdog_reset", 44},
- {"shutdown,", 45}, // Trailing comma is intentional.
+ {"shutdown,", 45}, // Trailing comma is intentional. Do NOT use.
{"shutdown,userrequested", 46},
{"reboot,bootloader", 47},
{"reboot,cold", 48},
@@ -262,8 +262,8 @@
{"oem_rpm_undef_error", 116},
{"oem_crash_on_the_lk", 117},
{"oem_rpm_reset", 118},
- {"oem_lpass_cfg", 119},
- {"oem_xpu_ns_error", 120},
+ {"REUSE1", 119}, // Former dupe, can be re-used
+ {"REUSE2", 120}, // Former dupe, can be re-used
{"factory_cable", 121},
{"oem_ar6320_failed_to_powerup", 122},
{"watchdog_rpm_bite", 123},
diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index d787d09..d652c0d 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -125,7 +125,7 @@
{ "product-services",
"product-services.img",
"product-services.sig",
- "product-services",
+ "product_services",
true, true },
{ "recovery", "recovery.img", "recovery.sig", "recovery", true, false },
{ "super", "super.img", "super.sig", "super", true, true },
diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index 8b46d64..f87a3b1 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -117,21 +117,17 @@
#define EM_ICE 2
#define EM_AES_256_CTS 3
#define EM_AES_256_HEH 4
-#define EM_SPECK_128_256_XTS 5
-#define EM_SPECK_128_256_CTS 6
static const struct flag_list file_contents_encryption_modes[] = {
{"aes-256-xts", EM_AES_256_XTS},
- {"speck128/256-xts", EM_SPECK_128_256_XTS},
{"software", EM_AES_256_XTS}, /* alias for backwards compatibility */
- {"ice", EM_ICE}, /* hardware-specific inline cryptographic engine */
+ {"ice", EM_ICE}, /* hardware-specific inline cryptographic engine */
{0, 0},
};
static const struct flag_list file_names_encryption_modes[] = {
{"aes-256-cts", EM_AES_256_CTS},
{"aes-256-heh", EM_AES_256_HEH},
- {"speck128/256-cts", EM_SPECK_128_256_CTS},
{0, 0},
};