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

am: 1f60a0c456

Change-Id: Ie5fbff7dd055c298ffa6f99d37f3ac1489dc30bb
This commit is contained in:
Yifan Hong
2018-11-16 16:12:58 -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);
}