Merge "Deprecate /factory" am: bedae3910c

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1547514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I724b201df6296d8b7fdc3b179ec62e27b40f9f04
This commit is contained in:
SzuWei Lin 2021-01-13 01:36:13 +00:00 committed by Automerger Merge Worker
commit 232c427b52

View file

@ -957,8 +957,6 @@ void PropertyLoadBootDefaults() {
load_properties_from_partition("odm", /* support_legacy_path_until */ 28);
load_properties_from_partition("product", /* support_legacy_path_until */ 30);
load_properties_from_file("/factory/factory.prop", "ro.*", &properties);
if (access(kDebugRamdiskProp, R_OK) == 0) {
LOG(INFO) << "Loading " << kDebugRamdiskProp;
load_properties_from_file(kDebugRamdiskProp, nullptr, &properties);