Merge "logical -> dynamic partitions." am: b22bd959e5

am: 5f16d61150

Change-Id: I7bacb1907eee4fd2b8240e71b46364d89146dd8b
This commit is contained in:
Yifan Hong
2018-11-16 16:10:55 -08:00
committed by android-build-merger
+2 -2
View File
@@ -365,7 +365,7 @@ int main(int argc, char** argv) {
if (option == "locale") {
locale = optarg;
} else if (option == "fastboot" &&
android::base::GetBoolProperty("ro.boot.logical_partitions", false)) {
android::base::GetBoolProperty("ro.boot.dynamic_partitions", false)) {
fastboot = true;
}
break;
@@ -426,7 +426,7 @@ int main(int argc, char** argv) {
device->RemoveMenuItemForAction(Device::WIPE_CACHE);
}
if (!android::base::GetBoolProperty("ro.boot.logical_partitions", false)) {
if (!android::base::GetBoolProperty("ro.boot.dynamic_partitions", false)) {
device->RemoveMenuItemForAction(Device::ENTER_FASTBOOT);
}