Snap for 6610492 from 30e3d1c440cbdf4429f27ecb37c01e4483bc1f01 to rvc-d1-release

Change-Id: I1188ed8120b5e2de72df7db0aa78963389b52b13

2 files changed, 11 insertions, 50 deletions

diff --git a/host/commands/assemble_cvd/super_image_mixer.cc b/host/commands/assemble_cvd/super_image_mixer.cc
index aae503381..117112621 100644
--- a/host/commands/assemble_cvd/super_image_mixer.cc
+++ b/host/commands/assemble_cvd/super_image_mixer.cc
@@ -66,8 +66,10 @@ const std::set<std::string> kDefaultTargetImages = {
   "IMAGES/vendor.img",
 };
 const std::set<std::string> kDefaultTargetBuildProp = {
+  "ODM/build.prop",
   "ODM/etc/build.prop",
   "VENDOR/build.prop",
+  "VENDOR/etc/build.prop",
 };
 
 void FindImports(cvd::Archive* archive, const std::string& build_prop_file) {
@@ -177,30 +179,6 @@ bool CombineTargetZipFiles(const std::string& default_target_zip,
       LOG(ERROR) << "Failed to extract " << name << " from the default target zip";
       return false;
     }
-    auto name_parts = android::base::Split(name, "/");
-    if (name_parts.size() < 2) {
-      LOG(WARNING) << name << " does not appear to have a partition";
-      continue;
-    }
-    auto etc_path = output_path + "/" + name_parts[0] + "/etc";
-    LOG(INFO) << "Creating directory " << etc_path;
-    if (mkdir(etc_path.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) < 0
-        && errno != EEXIST) {
-      PLOG(ERROR) << "Could not mkdir " << etc_path;
-    }
-    std::string_view name_suffix(name.data(), name.size());
-    if (!android::base::ConsumePrefix(&name_suffix, name_parts[0] + "/")) {
-      LOG(ERROR) << name << " did not start with " << name_parts[0] + "/";
-      return false;
-    }
-    auto initial_path = output_path + "/" + name;
-    auto dest_path = output_path + "/" + name_parts[0] + "/etc/" +
-                     std::string(name_suffix);
-    LOG(INFO) << "Linking " << initial_path << " to " << dest_path;
-    if (link(initial_path.c_str(), dest_path.c_str())) {
-      PLOG(ERROR) << "Could not link " << initial_path << " to " << dest_path;
-      return false;
-    }
   }
 
   for (const auto& name : system_target_contents) {
@@ -229,30 +207,6 @@ bool CombineTargetZipFiles(const std::string& default_target_zip,
       LOG(ERROR) << "Failed to extract " << name << " from the default target zip";
       return false;
     }
-    auto name_parts = android::base::Split(name, "/");
-    if (name_parts.size() < 2) {
-      LOG(WARNING) << name << " does not appear to have a partition";
-      continue;
-    }
-    auto etc_path = output_path + "/" + name_parts[0] + "/etc";
-    LOG(INFO) << "Creating directory " << etc_path;
-    if (mkdir(etc_path.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) < 0
-        && errno != EEXIST) {
-      PLOG(ERROR) << "Could not mkdir " << etc_path;
-    }
-    std::string_view name_suffix(name.data(), name.size());
-    if (!android::base::ConsumePrefix(&name_suffix, name_parts[0] + "/")) {
-      LOG(ERROR) << name << " did not start with " << name_parts[0] + "/";
-      return false;
-    }
-    auto initial_path = output_path + "/" + name;
-    auto dest_path = output_path + "/" + name_parts[0] + "/etc/" +
-                     std::string(name_suffix);
-    LOG(INFO) << "Linking " << initial_path << " to " << dest_path;
-    if (link(initial_path.c_str(), dest_path.c_str())) {
-      PLOG(ERROR) << "Could not link " << initial_path << " to " << dest_path;
-      return false;
-    }
   }
 
   return true;
diff --git a/vsoc_x86/auto/preinstalled-packages-product-car-cuttlefish.xml b/vsoc_x86/auto/preinstalled-packages-product-car-cuttlefish.xml
index e20ce9ecf..1536291a4 100644
--- a/vsoc_x86/auto/preinstalled-packages-product-car-cuttlefish.xml
+++ b/vsoc_x86/auto/preinstalled-packages-product-car-cuttlefish.xml
@@ -90,7 +90,6 @@
     <install-in-user-type package="com.android.car.goldilocks">
         <install-in user-type="FULL" />
     </install-in-user-type>
-
     <install-in-user-type package="com.android.car.speedbump">
         <install-in user-type="FULL" />
     </install-in-user-type>
@@ -130,10 +129,18 @@
     <install-in-user-type package="com.android.car.themeplayground">
         <install-in user-type="FULL" />
     </install-in-user-type>
-    <!-- TODO(b/144915994) Remove these com.android.theme.* pacakges-->
+    <install-in-user-type package="com.android.theme.color.amethyst">
+        <install-in user-type="FULL" />
+    </install-in-user-type>
+    <install-in-user-type package="com.android.theme.color.aquamarine">
+        <install-in user-type="FULL" />
+    </install-in-user-type>
     <install-in-user-type package="com.android.theme.color.black">
         <install-in user-type="FULL" />
     </install-in-user-type>
+    <install-in-user-type package="com.android.theme.color.tangerine">
+        <install-in user-type="FULL" />
+    </install-in-user-type>
     <install-in-user-type package="com.android.theme.color.cinnamon">
         <install-in user-type="FULL" />
     </install-in-user-type>