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

Commit 82976544 authored by Daniel Zheng's avatar Daniel Zheng
Browse files

snapuserd: remove unused headers 

headers should be used in the files that include them. Moving them to
respective locations

Test: th
Change-Id: I02bdb3b51b97a3073ec23ccc2e88cd844b44a532
parent 80cbaea0

fs_mgr/libsnapshot/snapuserd/user-space-merge/extractor.h

+1 −1
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 


#pragma once



#include <future>

#include <string>

#include <thread>



#include <android-base/unique_fd.h>

#include "merge_worker.h"

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

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <android-base/strings.h>

#include <snapuserd/dm_user_block_server.h>



#include <future>



#include "merge_worker.h"

#include "read_worker.h"

#include "utility.h"

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

+0 −4
Original line number Diff line number Diff line
@@ -24,15 +24,11 @@ 


#include <condition_variable>

#include <cstring>

#include <future>

#include <iostream>

#include <limits>

#include <mutex>

#include <ostream>

#include <string>

#include <thread>

#include <unordered_map>

#include <unordered_set>

#include <vector>



#include <android-base/file.h>

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

+1 −3
Original line number Diff line number Diff line
@@ -24,9 +24,8 @@ 
#include <unistd.h>



#include <chrono>

#include <iostream>

#include <future>

#include <memory>

#include <string_view>



#include <android-base/file.h>

#include <android-base/properties.h>
@@ -44,7 +43,6 @@ 
#include "snapuserd_core.h"

#include "testing/dm_user_harness.h"

#include "testing/host_harness.h"

#include "testing/temp_device.h"

#include "utility.h"



namespace android {

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

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

#include <android-base/strings.h>



#include "android-base/properties.h"

#include <future>



#include "snapuserd_core.h"

#include "utility.h"