commit ec2cace2b0a3bef3d62c5ced4ce1cfc953497dff
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 30 18:31:37 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 30 18:31:37 2020 +0000
tree afd16b328c36915bffe12eff08c42f8a95ab86df
parent 76d4cec6883bfba1ae5acf616744064c072efcc0
parent 881397e8634ad0f95d6a0a5d8fde21902802985f

Merge "fs_mgr: Fix MapScratchPartitionIfNeeded signature" am: 838b1a1f94 am: 9e3a7c41c2 am: 709346eb5c

Change-Id: I214ac0a98aadc4c3a0399a42b6f736f6088cc954

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index ca19782..2bc53d3 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -113,8 +113,8 @@
 namespace android {
 namespace fs_mgr {
 
-void MapScratchPartitionIfNeeded(Fstab*, const std::function<bool(const std::string&)>&) {}
-
+void MapScratchPartitionIfNeeded(Fstab*,
+                                 const std::function<bool(const std::set<std::string>&)>&) {}
 }  // namespace fs_mgr
 }  // namespace android