commit 1d8245b1c3ab8a0c1b0dbae1d5bda3e7ecc77df1
author android-build-team Robot <android-build-team-robot@google.com> Sat Feb 20 05:39:38 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Feb 20 05:39:38 2021 +0000
tree be493cf511424f22339082ccd833534d4f8e7181
parent 3e4b9b3b29bd85a89b026f4912dce8d6468383d1
parent 7b51190ed332c0c241083a8011544de142502432

Merge cherrypicks of [13636770, 13638692, 13636771, 13637567] into rvc-qpr2-release

Change-Id: Ic675f13f12fa3208ecdbb648dd33a2a7d3b06436

init/mount_handler.cpp

diff --git a/init/mount_handler.cpp b/init/mount_handler.cpp
index 01abba8..46f8331 100644
--- a/init/mount_handler.cpp
+++ b/init/mount_handler.cpp
@@ -130,7 +130,11 @@
     char* buf = nullptr;
     size_t len = 0;
     while (getline(&buf, &len, fp_.get()) != -1) {
-        auto entry = ParseMount(std::string(buf));
+        auto buf_string = std::string(buf);
+        if (buf_string.find("/emulated") != std::string::npos) {
+            continue;
+        }
+        auto entry = ParseMount(buf_string);
         auto match = untouched.find(entry);
         if (match == untouched.end()) {
             touched.emplace_back(std::move(entry));