summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2019-06-28 20:36:09 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-06-28 20:36:09 +0200
commitbbb76d513b55c032ee70325d29944165022de081 (patch)
tree80e5767a256632603536abcc7e4a0f8def656eae
parentMerge "Implement ShowMenu for StubRecoveryUI" am: 6f114c72db am: 116152d738 (diff)
parentMerge "Rename product_services to system_ext" am: b9f356f581 (diff)
downloadandroid_bootable_recovery-bbb76d513b55c032ee70325d29944165022de081.tar
android_bootable_recovery-bbb76d513b55c032ee70325d29944165022de081.tar.gz
android_bootable_recovery-bbb76d513b55c032ee70325d29944165022de081.tar.bz2
android_bootable_recovery-bbb76d513b55c032ee70325d29944165022de081.tar.lz
android_bootable_recovery-bbb76d513b55c032ee70325d29944165022de081.tar.xz
android_bootable_recovery-bbb76d513b55c032ee70325d29944165022de081.tar.zst
android_bootable_recovery-bbb76d513b55c032ee70325d29944165022de081.zip
-rw-r--r--updater/build_info.cpp2
-rw-r--r--updater/target_files.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/updater/build_info.cpp b/updater/build_info.cpp
index 8e87bd3e5..3072aab54 100644
--- a/updater/build_info.cpp
+++ b/updater/build_info.cpp
@@ -79,7 +79,7 @@ std::string BuildInfo::GetProperty(const std::string_view key,
"ro.product.name"
};
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()) {
std::string_view key_suffix(key);
diff --git a/updater/target_files.cpp b/updater/target_files.cpp
index 93540b2e5..1581b25a0 100644
--- a/updater/target_files.cpp
+++ b/updater/target_files.cpp
@@ -193,10 +193,10 @@ bool TargetFile::GetBuildProps(std::map<std::string, std::string, std::less<>>*
"SYSTEM/build.prop",
"VENDOR/build.prop",
"PRODUCT/build.prop",
- "PRODUCT_SERVICES/build.prop",
+ "SYSTEM_EXT/build.prop",
"SYSTEM/vendor/build.prop",
"SYSTEM/product/build.prop",
- "SYSTEM/product_services/build.prop",
+ "SYSTEM/ext/build.prop",
"ODM/build.prop", // legacy
"ODM/etc/build.prop",
"VENDOR/odm/build.prop", // legacy