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

Commit 64639fd7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "libcutils: compile with BOARD_VNDK_VERSION current" into oc-dev

parents 9610c548 1f83aa42

adb/daemon/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ 
#include <android-base/properties.h>

#include <android-base/stringprintf.h>

#include <libminijail.h>

#include <log/log_properties.h>

#include <scoped_minijail.h>



#include <private/android_filesystem_config.h>

#include <private/android_logger.h>

#include "debuggerd/handler.h"

#include "selinux/android.h"

adb/services.cpp

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include <android-base/properties.h>

#include <bootloader_message/bootloader_message.h>

#include <cutils/android_reboot.h>

#include <private/android_logger.h>

#include <log/log_properties.h>

#endif



#include "adb.h"

adb/set_verity_enable_state_service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


#include "android-base/properties.h"

#include "android-base/stringprintf.h"

#include <private/android_logger.h>

#include <log/log_properties.h>



#include "adb.h"

#include "adb_io.h"

adb/sockets.cpp

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


#if !ADB_HOST

#include <android-base/properties.h>

#include <private/android_logger.h>

#include <log/log_properties.h>

#endif



#include "adb.h"

fs_mgr/fs_mgr.cpp

+1 −1
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ 
#include <linux/fs.h>

#include <linux/loop.h>

#include <linux/magic.h>

#include <log/log_properties.h>

#include <logwrap/logwrap.h>

#include <private/android_logger.h>  // for __android_log_is_debuggable()



#include "fs_mgr.h"

#include "fs_mgr_avb.h"