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

Merge "Rename product_services to system_ext" am: b9f356f581

Browse Source 
am: b8e68bf831

Change-Id: Ica5c92b3fc0d5b5aa4546ea64d845fe00b4a2c25
This commit is contained in:
Tianjie Xu
2019-06-28 11:29:06 -07:00
committed by android-build-merger
parent 378dda080b b8e68bf831
commit 165fd3916e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
updater/build_info.cpp
View File

@@ -79,7 +79,7 @@ std::string BuildInfo::GetProperty(const std::string_view key,
"ro.product.name" "ro.product.name"
}; };
const std::vector<std::string> source_order = { const std::vector<std::string> source_order = {
"product", "product_services", "odm", "vendor", "system", "product", "odm", "vendor", "system_ext", "system",
}; };
if (ro_product_props.find(key) != ro_product_props.end()) { if (ro_product_props.find(key) != ro_product_props.end()) {
std::string_view key_suffix(key); std::string_view key_suffix(key);

4
updater/target_files.cpp
View File

@@ -193,10 +193,10 @@ bool TargetFile::GetBuildProps(std::map<std::string, std::string, std::less<>>*
"SYSTEM/build.prop", "SYSTEM/build.prop",
"VENDOR/build.prop", "VENDOR/build.prop",
"PRODUCT/build.prop", "PRODUCT/build.prop",
"PRODUCT_SERVICES/build.prop", "SYSTEM_EXT/build.prop",
"SYSTEM/vendor/build.prop", "SYSTEM/vendor/build.prop",
"SYSTEM/product/build.prop", "SYSTEM/product/build.prop",
"SYSTEM/product_services/build.prop", "SYSTEM/ext/build.prop",
"ODM/build.prop", // legacy "ODM/build.prop", // legacy
"ODM/etc/build.prop", "ODM/etc/build.prop",
"VENDOR/odm/build.prop", // legacy "VENDOR/odm/build.prop", // legacy