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

Commit 953af4ca authored by Daniel Zheng's avatar Daniel Zheng Committed by Automerger Merge Worker
Browse files

Merge "Moving logging include" am: 729c1597 am: babdb7b2 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2536970



Change-Id: Ibbf7c990ccbabbda494435ea409fb93150de150d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8664d239 babdb7b2

fastboot/fastboot_driver.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <vector>

#include <vector>





#include <android-base/endian.h>

#include <android-base/endian.h>

#include <android-base/logging.h>

#include <android-base/stringprintf.h>

#include <android-base/stringprintf.h>

#include <android-base/unique_fd.h>

#include <android-base/unique_fd.h>

#include <bootimg.h>

#include <bootimg.h>

fastboot/task.cpp

+5 −2
Original line number Original line Diff line number Diff line
@@ -14,13 +14,16 @@ 
// limitations under the License.

// limitations under the License.

//

//

#include "task.h"

#include "task.h"



#include <iostream>

#include <iostream>



#include <android-base/logging.h>

#include <android-base/parseint.h>



#include "fastboot.h"

#include "fastboot.h"

#include "filesystem.h"

#include "filesystem.h"

#include "super_flash_helper.h"

#include "super_flash_helper.h"





#include <android-base/parseint.h>



using namespace std::string_literals;

using namespace std::string_literals;

FlashTask::FlashTask(const std::string& _slot, const std::string& _pname, const std::string& _fname,

FlashTask::FlashTask(const std::string& _slot, const std::string& _pname, const std::string& _fname,

                     const bool apply_vbmeta)

                     const bool apply_vbmeta)