PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of d5c7d6b to nyc-mr1-dev-plus-aosp

Browse Source 
Change-Id: Ia041044547351a3e65b647bb9913aa18c7d2c97c
This commit is contained in:
Elliott Hughes
2016-09-26 12:52:42 -07:00
parent c8db481780 d5c7d6bffe
commit 130f6c86f5
8 changed files with 40 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bootloader_message/bootloader_message.cpp
View File

@@ -19,25 +19,24 @@
#include <errno.h>
#include <fcntl.h>
#include <string.h>
#include <sys/system_properties.h>
#include <string>
#include <vector>
#include <android-base/file.h>
#include <android-base/properties.h>
#include <android-base/stringprintf.h>
#include <android-base/unique_fd.h>
#include <fs_mgr.h>
static struct fstab* read_fstab(std::string* err) {
// The fstab path is always "/fstab.${ro.hardware}".
std::string fstab_path = "/fstab.";
char value[PROP_VALUE_MAX];
if (__system_property_get("ro.hardware", value) == 0) {
std::string ro_hardware = android::base::GetProperty("ro.hardware", "");
if (ro_hardware.empty()) {
*err = "failed to get ro.hardware";
return nullptr;
}
fstab_path += value;
// The fstab path is always "/fstab.${ro.hardware}".
std::string fstab_path = "/fstab." + ro_hardware;
struct fstab* fstab = fs_mgr_read_fstab(fstab_path.c_str());
if (fstab == nullptr) {
*err = "failed to read " + fstab_path;