commit b9f356f581f3a1c428cdb465954446828a39323a
author Tianjie Xu <xunchang@google.com> Fri Jun 28 17:45:16 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 28 17:45:16 2019 +0000
tree 87b0ed752d7f2e5d012b791a6b8003713378e485
parent 6f114c72dbfd9764f0e04c39e054d4563ffc694f
parent 7ba8f18590559cde3632a24dcfdaf6c2f5dfb31e

Merge "Rename product_services to system_ext"

updater/build_info.cpp

diff --git a/updater/build_info.cpp b/updater/build_info.cpp
index 8e87bd3..3072aab 100644
--- a/updater/build_info.cpp
+++ b/updater/build_info.cpp
@@ -79,7 +79,7 @@
     "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);

updater/target_files.cpp

diff --git a/updater/target_files.cpp b/updater/target_files.cpp
index 93540b2..1581b25 100644
--- a/updater/target_files.cpp
+++ b/updater/target_files.cpp
@@ -193,10 +193,10 @@
     "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