commit 8ecb65f57ba65c6fc415e40c0dd3f3730088a55d
author Justin Yun <justinyun@google.com> Mon Jul 01 11:04:13 2019 +0900
committer Justin Yun <justinyun@google.com> Mon Jul 01 11:08:14 2019 +0900
tree f07842785eb7da8e39397fe827f096fcb0f44bf9
parent 3c7e4b604621ee7f0a02855bd61ddb1d5ec87e5e

Rename product_services to system_ext

Bug: 134359158
Test: run tests for update_engine_unittests
Change-Id: I5d5b7f33f2b106f23152049f07e4b44c0cdcdc7e

boot_control_android_unittest.cc

diff --git a/boot_control_android_unittest.cc b/boot_control_android_unittest.cc
index b2885a3..65c2381 100644
--- a/boot_control_android_unittest.cc
+++ b/boot_control_android_unittest.cc
@@ -784,12 +784,11 @@
 
 TEST_P(BootControlAndroidGroupTestP, AddPartitionToGroup) {
   ExpectStoreMetadata(PartitionMetadata{
-      .groups = {
-          {.name = T("android"),
-           .size = 3_GiB,
-           .partitions = {{.name = T("system"), .size = 2_GiB},
-                          {.name = T("product_services"), .size = 1_GiB}}}}});
-  ExpectUnmap({T("system"), T("vendor"), T("product_services")});
+      .groups = {{.name = T("android"),
+                  .size = 3_GiB,
+                  .partitions = {{.name = T("system"), .size = 2_GiB},
+                                 {.name = T("system_ext"), .size = 1_GiB}}}}});
+  ExpectUnmap({T("system"), T("vendor"), T("system_ext")});
 
   EXPECT_TRUE(bootctl_.InitPartitionMetadata(
       target(),
@@ -797,8 +796,7 @@
           .groups = {{.name = "android",
                       .size = 3_GiB,
                       .partitions = {{.name = "system", .size = 2_GiB},
-                                     {.name = "product_services",
-                                      .size = 1_GiB}}},
+                                     {.name = "system_ext", .size = 1_GiB}}},
                      SimpleGroup("oem", 2_GiB, "vendor", 2_GiB)}},
       true));
 }

payload_generator/payload_generation_config_unittest.cc

diff --git a/payload_generator/payload_generation_config_unittest.cc b/payload_generator/payload_generation_config_unittest.cc
index 70a3df3..aca9655 100644
--- a/payload_generator/payload_generation_config_unittest.cc
+++ b/payload_generator/payload_generation_config_unittest.cc
@@ -59,7 +59,7 @@
   ASSERT_TRUE(
       store.LoadFromString("super_partition_groups=group_a group_b\n"
                            "group_a_size=3221225472\n"
-                           "group_a_partition_list=system product_services\n"
+                           "group_a_partition_list=system system_ext\n"
                            "group_b_size=2147483648\n"
                            "group_b_partition_list=vendor\n"));
   EXPECT_TRUE(image_config.LoadDynamicPartitionMetadata(store));
@@ -72,7 +72,7 @@
   EXPECT_EQ(3221225472u, group_a.size());
   ASSERT_EQ(2, group_a.partition_names_size());
   EXPECT_EQ("system", group_a.partition_names(0));
-  EXPECT_EQ("product_services", group_a.partition_names(1));
+  EXPECT_EQ("system_ext", group_a.partition_names(1));
 
   const auto& group_b = image_config.dynamic_partition_metadata->groups(1);
   EXPECT_EQ("group_b", group_b.name());
@@ -108,17 +108,17 @@
 
   PartitionConfig system("system");
   system.size = 2147483648u;
-  PartitionConfig product_services("product_services");
-  product_services.size = 1073741824u;
+  PartitionConfig system_ext("system_ext");
+  system_ext.size = 1073741824u;
 
   image_config.partitions.push_back(std::move(system));
-  image_config.partitions.push_back(std::move(product_services));
+  image_config.partitions.push_back(std::move(system_ext));
 
   brillo::KeyValueStore store;
   ASSERT_TRUE(
       store.LoadFromString("super_partition_groups=foo\n"
                            "foo_size=3221225472\n"
-                           "foo_partition_list=system product_services\n"));
+                           "foo_partition_list=system system_ext\n"));
   EXPECT_TRUE(image_config.LoadDynamicPartitionMetadata(store));
   EXPECT_NE(nullptr, image_config.dynamic_partition_metadata);