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

Commit 27cdfc3e authored by Josh Gao's avatar Josh Gao
Browse files

resolve merge conflicts of f79a82d6 to nyc-mr1-dev-plus-aosp 

Change-Id: I5a9fbde2637d746bfd32d5b7546777708746e6d9
parents 354b20fe f79a82d6

cmds/dumpstate/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ LOCAL_SRC_FILES := dumpstate.cpp utils.cpp 


LOCAL_MODULE := dumpstate



LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux libbase

LOCAL_SHARED_LIBRARIES := libcutils libdebuggerd_client liblog libselinux libbase

# ZipArchive support, the order matters here to get all symbols.

LOCAL_STATIC_LIBRARIES := libziparchive libz libcrypto_static

LOCAL_HAL_STATIC_LIBRARIES := libdumpstate

cmds/dumpstate/utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ 
#include <vector>



#include <android-base/file.h>

#include <cutils/debugger.h>

#include <cutils/properties.h>

#include <cutils/sockets.h>

#include <debuggerd/client.h>

#include <log/log.h>

#include <private/android_filesystem_config.h>