Merge up to android-8.1.0_r1 and fix conflicts

Change-Id: I2dc060134d15ec9f015a606cb24ef8276f6af1fc
2017-12-14 14:43:59 -06:00
parent ea4efc6d20 435a2031d6
commit ecbd3e8ba9
96 changed files with 5341 additions and 4510 deletions
@@ -191,6 +191,11 @@ static_assert(sizeof(struct bootloader_control) ==
 #include <string>
 #include <vector>

+// Return the block device name for the bootloader message partition and waits
+// for the device for up to 10 seconds. In case of error returns the empty
+// string.
+std::string get_bootloader_message_blk_device(std::string* err);
+
 // Read bootloader message into boot. Error message will be set in err.
 bool read_bootloader_message(bootloader_message* boot, std::string* err);