commit 165fd3916e3a1b67d09028d4c185f7789afd4f0b
author Tianjie Xu <xunchang@google.com> Fri Jun 28 11:29:06 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 28 11:29:06 2019 -0700
tree 80e5767a256632603536abcc7e4a0f8def656eae
parent 378dda080b198320f7aab89d78129f50091282f5
parent b8e68bf8313cbc79d59a926ee4535a9a3bd47d43

Merge "Rename product_services to system_ext" am: b9f356f581
am: b8e68bf831

Change-Id: Ica5c92b3fc0d5b5aa4546ea64d845fe00b4a2c25

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