Merge "Revert "Support Speck encryption.""
diff --git a/adf/libadf/Android.bp b/adf/libadf/Android.bp
index 8eef2ea..49e3721 100644
--- a/adf/libadf/Android.bp
+++ b/adf/libadf/Android.bp
@@ -14,6 +14,7 @@
cc_library {
name: "libadf",
+ recovery_available: true,
vendor_available: true,
vndk: {
enabled: true,
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/libsync/Android.bp b/libsync/Android.bp
index c95563d..dbee596 100644
--- a/libsync/Android.bp
+++ b/libsync/Android.bp
@@ -36,6 +36,7 @@
// anything statically linked against the current libsync.
cc_library_static {
name: "libsync_recovery",
+ recovery_available: true,
defaults: ["libsync_defaults"],
}
