android/device_phh_treble
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix lptools build for Android 11

Browse Source
This commit is contained in:
Pierre-Hugues Husson 2020-09-27 19:57:32 +02:00
parent 5bcb2e09a8
commit 510e08cefd
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cmds/lptools.cc
View File

@ -62,7 +62,6 @@ public:
static FileOrBlockDeviceOpener opener; static FileOrBlockDeviceOpener opener;
std::unique_ptr<MetadataBuilder> makeBuilder() { std::unique_ptr<MetadataBuilder> makeBuilder() {
MetadataBuilder::OverrideABForTesting(false);
auto builder = MetadataBuilder::New(opener, "super", 0); auto builder = MetadataBuilder::New(opener, "super", 0);
if(builder == nullptr) { if(builder == nullptr) {
std::cout << "Failed creating super builder" << std::endl; std::cout << "Failed creating super builder" << std::endl;
@ -121,11 +120,14 @@ int main(int argc, char **argv) {
saveToDisk(std::move(builder)); saveToDisk(std::move(builder));
std::string dmPath; std::string dmPath;
auto dmCreateRes = android::fs_mgr::CreateLogicalPartition( CreateLogicalPartitionParams params {
"/dev/block/by-name/super", .block_device = "/dev/block/by-name/super",
0, partName, .metadata_slot = 0,
true, .partition_name = partName,
std::chrono::milliseconds(10000), &dmPath); .timeout_ms = std::chrono::milliseconds(10000),
.force_writable = true,
};
auto dmCreateRes = android::fs_mgr::CreateLogicalPartition(params, &dmPath);
std::cout << "Creating dm partition for " << partName << " answered " << dmCreateRes << " at " << dmPath << std::endl; std::cout << "Creating dm partition for " << partName << " answered " << dmCreateRes << " at " << dmPath << std::endl;
exit(0); exit(0);
} else if(strcmp(argv[1], "remove") == 0) { } else if(strcmp(argv[1], "remove") == 0) {
@ -136,7 +138,7 @@ int main(int argc, char **argv) {
auto partName = argv[2]; auto partName = argv[2];
auto dmState = android::dm::DeviceMapper::Instance().GetState(partName); auto dmState = android::dm::DeviceMapper::Instance().GetState(partName);
if(dmState == android::dm::DmDeviceState::ACTIVE) { if(dmState == android::dm::DmDeviceState::ACTIVE) {
android::fs_mgr::DestroyLogicalPartition(partName, std::chrono::milliseconds(2000)); android::fs_mgr::DestroyLogicalPartition(partName);
} }
builder->RemovePartition(partName); builder->RemovePartition(partName);
saveToDisk(std::move(builder)); saveToDisk(std::move(builder));
@ -191,11 +193,14 @@ int main(int argc, char **argv) {
} }
auto partName = argv[2]; auto partName = argv[2];
std::string dmPath; std::string dmPath;
auto dmCreateRes = android::fs_mgr::CreateLogicalPartition( CreateLogicalPartitionParams params {
"/dev/block/by-name/super", .block_device = "/dev/block/by-name/super",
0, partName, .metadata_slot = 0,
true, .partition_name = partName,
std::chrono::milliseconds(10000), &dmPath); .timeout_ms = std::chrono::milliseconds(10000),
.force_writable = true,
};
auto dmCreateRes = android::fs_mgr::CreateLogicalPartition(params, &dmPath);
std::cout << "Creating dm partition for " << partName << " answered " << dmCreateRes << " at " << dmPath << std::endl; std::cout << "Creating dm partition for " << partName << " answered " << dmCreateRes << " at " << dmPath << std::endl;
exit(0); exit(0);
} else if(strcmp(argv[1], "unmap") == 0) { } else if(strcmp(argv[1], "unmap") == 0) {
@ -206,7 +211,7 @@ int main(int argc, char **argv) {
auto partName = argv[2]; auto partName = argv[2];
auto dmState = android::dm::DeviceMapper::Instance().GetState(partName); auto dmState = android::dm::DeviceMapper::Instance().GetState(partName);
if(dmState == android::dm::DmDeviceState::ACTIVE) { if(dmState == android::dm::DmDeviceState::ACTIVE) {
android::fs_mgr::DestroyLogicalPartition(partName, std::chrono::milliseconds(2000)); android::fs_mgr::DestroyLogicalPartition(partName);
} }
exit(0); exit(0);
} }