Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76094b49 authored by David Anderson's avatar David Anderson
Browse files

snapuserd: Rename snapuserd_merge to merge_worker. 

This follows the recently added names read_worker and worker.

Bug: 288273605
Test: builds
Change-Id: Ie75e94405a018dd0068aa24aefd268adb1aee17e
parent bcb34d2c

fs_mgr/libsnapshot/snapuserd/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -64,9 +64,9 @@ cc_library_static { 
        "dm-snapshot-merge/snapuserd_readahead.cpp",

        "snapuserd_buffer.cpp",

        "user-space-merge/handler_manager.cpp",

        "user-space-merge/merge_worker.cpp",

        "user-space-merge/read_worker.cpp",

        "user-space-merge/snapuserd_core.cpp",

        "user-space-merge/snapuserd_merge.cpp",

        "user-space-merge/snapuserd_readahead.cpp",

        "user-space-merge/snapuserd_transitions.cpp",

        "user-space-merge/snapuserd_verify.cpp",

fs_mgr/libsnapshot/snapuserd/user-space-merge/handler_manager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ 


#include <android-base/logging.h>



#include "merge_worker.h"

#include "read_worker.h"

#include "snapuserd_core.h"

#include "snapuserd_merge.h"



namespace android {

namespace snapshot {

fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_merge.cpp→fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#include "snapuserd_merge.h"

#include "merge_worker.h"



#include "snapuserd_core.h"

fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp

+1 −1
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
#include <android-base/scopeguard.h>

#include <android-base/strings.h>



#include "merge_worker.h"

#include "read_worker.h"

#include "snapuserd_merge.h"



namespace android {

namespace snapshot {